From 7f1bc985dc0af4b953674f0e6702bada30f32a80 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Wed, 10 Dec 2008 20:36:37 +0200 Subject: apt.conf: mentioned '/* ... */'-comments. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 83aa70d4d..8eccc27ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.7.20) unstable; urgency=low (Closes: #457265) - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) + - Mentioned '/* ... */' comments. (Closes: #507601) -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 -- cgit v1.2.3-70-g09d2 From a70c81475ae682d9b1f4d3ed76c1644f701bfca2 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 12 Dec 2008 20:57:45 +0100 Subject: Finnish translation update --- debian/changelog | 4 ++++ po/ChangeLog | 4 ++++ po/fi.po | 61 +++++++------------------------------------------------- 3 files changed, 15 insertions(+), 54 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b3c1a470..144623c3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,10 @@ apt (0.7.20) unstable; urgency=low APT::Get::Build-Dep-Automatic to false (thanks to Aaron Haviland, closes: #44874, LP: #248268) + [ Christian Perrier ] + * Translations: + - Finnish updated. Closes: #508449 + -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 apt (0.7.20~exp2) unstable; urgency=low diff --git a/po/ChangeLog b/po/ChangeLog index e71fb1447..a63e1c430 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2008-12-12 Tapio Lehtonen + + * fi.po: updated to 539t. + 2008-12-06 Christian Perrier * fr.po: dropped awful use of first person diff --git a/po/fi.po b/po/fi.po index bffceef74..f64638966 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-05-04 19:30+0300\n" +"PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -164,43 +164,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" #: cmdline/apt-cache.cc:1721 -#, fuzzy -#| msgid "" -#| "Usage: apt-cache [options] command\n" -#| " apt-cache [options] add file1 [file2 ...]\n" -#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -#| "\n" -#| "apt-cache is a low-level tool used to manipulate APT's binary\n" -#| "cache files, and query information from them\n" -#| "\n" -#| "Commands:\n" -#| " add - Add a package file to the source cache\n" -#| " gencaches - Build both the package and source cache\n" -#| " showpkg - Show some general information for a single package\n" -#| " showsrc - Show source records\n" -#| " stats - Show some basic statistics\n" -#| " dump - Show the entire file in a terse form\n" -#| " dumpavail - Print an available file to stdout\n" -#| " unmet - Show unmet dependencies\n" -#| " search - Search the package list for a regex pattern\n" -#| " show - Show a readable record for the package\n" -#| " depends - Show raw dependency information for a package\n" -#| " rdepends - Show reverse dependency information for a package\n" -#| " pkgnames - List the names of all packages\n" -#| " dotty - Generate package graphs for GraphViz\n" -#| " xvcg - Generate package graphs for xvcg\n" -#| " policy - Show policy settings\n" -#| "\n" -#| "Options:\n" -#| " -h This help text.\n" -#| " -p=? The package cache.\n" -#| " -s=? The source cache.\n" -#| " -q Disable progress indicator.\n" -#| " -i Show only important deps for the unmet command.\n" -#| " -c=? Read this configuration file\n" -#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -258,7 +221,7 @@ msgstr "" " show - Näytä paketin tietue luettavassa muodossa\n" " depends - Näytä paketin riippuvuustiedot käsittelemättömässä muodossa\n" " rdepends - Näytä paketin käänteiset riippuvuudet\n" -" pkgnames - Luettele kaikkien pakettien nimet\n" +" pkgnames - Luettele järjestelmän kaikkien pakettien nimet\n" " dotty - Tee paketeista graafit GraphViz-muodossa\n" " xvcg - Tee paketeista graafit xvcg-muodossa\n" " policy - Näytä mistä asennuspaketteja haetaan\n" @@ -2094,9 +2057,8 @@ msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -#, fuzzy msgid "Failed to truncate file" -msgstr "Tiedoston %s kirjoittaminen ei onnistunut" +msgstr "Tiedoston typistäminen ei onnistunut" #: methods/http.cc:1105 msgid "Bad header data" @@ -2121,7 +2083,7 @@ msgstr "Ei voitu tehdä %lu tavun mmap:ia" #: apt-pkg/contrib/mmap.cc:213 msgid "Dynamic MMap ran out of room" -msgstr "" +msgstr "Tila loppui kesken dynaamiselta MMap:lta" #: apt-pkg/contrib/strutl.cc:1014 #, c-format @@ -2846,9 +2808,9 @@ msgstr "" "tiedostoa\n" #: apt-pkg/deb/dpkgpm.cc:49 -#, fuzzy, c-format +#, c-format msgid "Installing %s" -msgstr "%s asennettu" +msgstr "Asennetaan %s" #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 #, c-format @@ -2863,7 +2825,7 @@ msgstr "Poistetaan %s" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Running post-installation trigger %s" -msgstr "" +msgstr "Suoritetaan jälkiasennusliipaisin %s" #: apt-pkg/deb/dpkgpm.cc:521 #, c-format @@ -2929,12 +2891,3 @@ msgstr "Tiedostoa %s ei voitu avata" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Koska komennettiin vain yksi toimenpide, erittäin todennäköisesti\n" -#~ "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n" -#~ "tuosta paketista." -- cgit v1.2.3-70-g09d2 From 788a8f42c1ec146c812550d076e5fb720e83ae52 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Mon, 15 Dec 2008 21:17:39 +0200 Subject: Make apt proxy options have the highest priority, unified proxy determining code. --- configure.in | 2 +- debian/changelog | 6 ++++++ doc/apt.conf.5.xml | 15 ++++++++++----- methods/ftp.cc | 33 +++++++++++++++++++-------------- methods/http.cc | 31 ++++++++++++++++++------------- methods/https.cc | 31 +++++++++++++++++++------------ 6 files changed, 73 insertions(+), 45 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index f90a32c3b..04d8a4712 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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.20~exp3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 90be66400..304e0fb2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,12 @@ apt (0.7.20) unstable; urgency=low - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) - Mentioned '/* ... */' comments. (Closes: #507601) + * methods/{http,https,ftp}, doc/apt.conf.5.xml: + - Changed and unified the code that determines which proxy to use. Now + 'Acquire::{http,ftp}::Proxy[::]' options have the highest priority, + and '{http,ftp}_proxy' environment variables are used only if options + mentioned above are not specified. + (Closes: #445985, #157759, #320184, #365880, #479617) [ Michael Vogt ] * make "apt-get build-dep" installed packages marked automatic diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 74966c5b3..4d9e708a8 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -202,8 +202,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; standard form of http://[[user][:pass]@]host[:port]/. Per host proxies can also be specified by using the form http::Proxy::<host> with the special keyword DIRECT - meaning to use no proxies. The http_proxy environment variable - will override all settings. + meaning to use no proxies. If no one of the above settings is specified, + http_proxy environment variable + will be used. Three settings are provided for cache control with HTTP/1.1 compliant proxy caches. No-Cache tells the proxy to not use its cached @@ -251,9 +252,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; ftp - FTP URIs; ftp::Proxy is the default proxy server to use. It is in the - standard form of ftp://[[user][:pass]@]host[:port]/ and is - overridden by the ftp_proxy environment variable. To use a 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 + ftp::Proxy::<host> with the special keyword DIRECT + meaning to use no proxies. If no one of the above settings is specified, + ftp_proxy environment variable + will be used. To use a ftp proxy you will have to set the ftp::ProxyLogin script in the configuration file. This entry specifies the commands to send to tell the proxy server what to connect to. Please see diff --git a/methods/ftp.cc b/methods/ftp.cc index 554a24cf5..c91600ad5 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -112,23 +112,28 @@ bool FTPConn::Open(pkgAcqMethod *Owner) Close(); // Determine the proxy setting - if (getenv("ftp_proxy") == 0) + string SpecificProxy = _config->Find("Acquire::ftp::Proxy::" + ServerName.Host); + if (!SpecificProxy.empty()) { - string DefProxy = _config->Find("Acquire::ftp::Proxy"); - string SpecificProxy = _config->Find("Acquire::ftp::Proxy::" + ServerName.Host); - if (SpecificProxy.empty() == false) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - Proxy = DefProxy; + if (SpecificProxy == "DIRECT") + Proxy = ""; + else + Proxy = SpecificProxy; } else - Proxy = getenv("ftp_proxy"); - + { + string DefProxy = _config->Find("Acquire::ftp::Proxy"); + if (!DefProxy.empty()) + { + Proxy = DefProxy; + } + else + { + char* result = getenv("ftp_proxy"); + Proxy = result ? result : ""; + } + } + // Parse no_proxy, a , separated list of domains if (getenv("no_proxy") != 0) { diff --git a/methods/http.cc b/methods/http.cc index b3c791fa0..5d18b3adc 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -309,22 +309,27 @@ bool ServerState::Open() Persistent = true; // Determine the proxy setting - if (getenv("http_proxy") == 0) + string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); + if (!SpecificProxy.empty()) { - string DefProxy = _config->Find("Acquire::http::Proxy"); - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (SpecificProxy.empty() == false) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - Proxy = DefProxy; + if (SpecificProxy == "DIRECT") + Proxy = ""; + else + Proxy = SpecificProxy; } else - Proxy = getenv("http_proxy"); + { + string DefProxy = _config->Find("Acquire::http::Proxy"); + if (!DefProxy.empty()) + { + Proxy = DefProxy; + } + else + { + char* result = getenv("http_proxy"); + Proxy = result ? result : ""; + } + } // Parse no_proxy, a , separated list of domains if (getenv("no_proxy") != 0) diff --git a/methods/https.cc b/methods/https.cc index 98dfeefa1..728869fa2 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -61,19 +61,26 @@ void HttpsMethod::SetupProxy() URI ServerName = Queue->Uri; // Determine the proxy setting - if (getenv("http_proxy") == 0) + string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); + if (!SpecificProxy.empty()) { - string DefProxy = _config->Find("Acquire::http::Proxy"); - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (SpecificProxy.empty() == false) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - Proxy = DefProxy; + if (SpecificProxy == "DIRECT") + Proxy = ""; + else + Proxy = SpecificProxy; + } + else + { + string DefProxy = _config->Find("Acquire::http::Proxy"); + if (!DefProxy.empty()) + { + Proxy = DefProxy; + } + else + { + char* result = getenv("http_proxy"); + Proxy = result ? result : ""; + } } // Parse no_proxy, a , separated list of domains -- cgit v1.2.3-70-g09d2 From b43b5a7d67cdf706afbb30ff470f1a8d7d810986 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Dec 2008 22:16:12 +0100 Subject: debian/changelog: make the build-dep changelog entry match (debian) reality --- debian/changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 90be66400..bf92fede2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,10 +15,11 @@ apt (0.7.20) unstable; urgency=low - Mentioned '/* ... */' comments. (Closes: #507601) [ Michael Vogt ] - * make "apt-get build-dep" installed packages marked automatic - by default. This can be changed by setting the value of - APT::Get::Build-Dep-Automatic to false (thanks to Aaron - Haviland, closes: #44874, LP: #248268) + * add option to "apt-get build-dep" to mark the needed + build-dep packages as automatic installed. + This is controlled via the value of + APT::Get::Build-Dep-Automatic and is set "false" by default. + Thanks to Aaron Haviland, closes: #44874 [ Christian Perrier ] * Translations: -- cgit v1.2.3-70-g09d2 From 819f001b22879f19a2ce9275f14b6a99c453fc80 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 15 Dec 2008 22:22:20 +0100 Subject: debian/changelog: and fix the bugnumber (thanks to jackyf --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bf92fede2..35a8fb2b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ apt (0.7.20) unstable; urgency=low build-dep packages as automatic installed. This is controlled via the value of APT::Get::Build-Dep-Automatic and is set "false" by default. - Thanks to Aaron Haviland, closes: #44874 + Thanks to Aaron Haviland, closes: #448743 [ Christian Perrier ] * Translations: -- cgit v1.2.3-70-g09d2 From 1d39ef1994ae82f5f6d78e2be75ce0afb498aae8 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Mon, 15 Dec 2008 23:49:08 +0200 Subject: debian/changelog: updated date --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b57c96a3..fa3ecf018 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,7 @@ apt (0.7.20) unstable; urgency=low * Translations: - Finnish updated. Closes: #508449 - -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 + -- Eugene V. Lyubimkin Mon, 15 Dec 2008 23:48:46 +0200 apt (0.7.20~exp2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 6f388ec39823d67a233e8ad7949077b9c9f36707 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Dec 2008 23:19:37 +0100 Subject: * apt-inst/contrib/arfile.cc: - support members ending with '/' as well (thanks to Michal Cihr, closes: #500988) --- apt-inst/contrib/arfile.cc | 2 +- debian/changelog | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index a1fb97b48..7c85f2e86 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -111,7 +111,7 @@ bool ARArchive::LoadHeaders() else { unsigned int I = sizeof(Head.Name) - 1; - for (; Head.Name[I] == ' '; I--); + for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--); Memb->Name = string(Head.Name,I+1); } diff --git a/debian/changelog b/debian/changelog index 35a8fb2b4..2d765c6a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ apt (0.7.20) unstable; urgency=low This is controlled via the value of APT::Get::Build-Dep-Automatic and is set "false" by default. Thanks to Aaron Haviland, closes: #448743 + * apt-inst/contrib/arfile.cc: + - support members ending with '/' as well (thanks to Michal Cihr, + closes: #500988) [ Christian Perrier ] * Translations: -- cgit v1.2.3-70-g09d2 From 4343b16d476ba388fa3475c96627e2a14a2d0f6d Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 18 Dec 2008 00:28:03 +0200 Subject: Fixed typo in changelog. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fa3ecf018..285c11922 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ apt (0.7.20) unstable; urgency=low * buildlib/config.{sub,guess}: - Renewed. This fixes lintian errors. * doc/apt.conf.5.xml, debian/apt-transport-https: - - Documented briefly 'APT::https' group of options. (Closes: #507398) + - Documented briefly 'Acquire::https' group of options. (Closes: #507398) - Applied patch from Daniel Burrows to document 'Debug' group of options. (Closes: #457265) - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. -- cgit v1.2.3-70-g09d2 From 629e1b39213b59d41c35a18a04278507b1630083 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 18 Dec 2008 00:35:00 +0200 Subject: Noted in NEWS.Debian changes in determining proxy algorithm. --- debian/NEWS.Debian | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index f44d1966b..5730fd7c6 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,12 @@ +apt (0.7.20) unstable; urgency=low + + * Code that determines which proxy to use was changed. Now + 'Acquire::{http,ftp}::Proxy[::]' options have the highest priority, + and '{http,ftp}_proxy' environment variables are used only if options + mentioned above are not specified. + + -- Eugene V. Lyubimkin Thu, 18 Dec 2008 00:30:16 +0200 + apt (0.6.44) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. -- cgit v1.2.3-70-g09d2 From 074d72ebefa42e8b2bea2062114a44cd0445bfad Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 18 Dec 2008 00:36:27 +0200 Subject: Rename: 'debian/NEWS.Debian' => 'debian/NEWS' to make the file recognizeable by debhelper and, so, installed. --- debian/NEWS | 27 +++++++++++++++++++++++++++ debian/NEWS.Debian | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 debian/NEWS delete mode 100644 debian/NEWS.Debian (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..5730fd7c6 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,27 @@ +apt (0.7.20) unstable; urgency=low + + * Code that determines which proxy to use was changed. Now + 'Acquire::{http,ftp}::Proxy[::]' options have the highest priority, + and '{http,ftp}_proxy' environment variables are used only if options + mentioned above are not specified. + + -- Eugene V. Lyubimkin Thu, 18 Dec 2008 00:30:16 +0200 + +apt (0.6.44) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. + If you use a database created by an older version of apt, delete + it and allow it to be recreated the next time. + + -- Michael Vogt Wed, 26 Apr 2006 12:57:53 +0200 + +apt (0.5.25) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a + database created by an older version of apt, an attempt will be made + to upgrade the database, but this may not work in all cases. If your + database is not automatically upgraded, delete it and allow it to be + recreated the next time. + + -- Matt Zimmerman Sat, 8 May 2004 12:38:07 -0700 + diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian deleted file mode 100644 index 5730fd7c6..000000000 --- a/debian/NEWS.Debian +++ /dev/null @@ -1,27 +0,0 @@ -apt (0.7.20) unstable; urgency=low - - * Code that determines which proxy to use was changed. Now - 'Acquire::{http,ftp}::Proxy[::]' options have the highest priority, - and '{http,ftp}_proxy' environment variables are used only if options - mentioned above are not specified. - - -- Eugene V. Lyubimkin Thu, 18 Dec 2008 00:30:16 +0200 - -apt (0.6.44) unstable; urgency=low - - * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. - If you use a database created by an older version of apt, delete - it and allow it to be recreated the next time. - - -- Michael Vogt Wed, 26 Apr 2006 12:57:53 +0200 - -apt (0.5.25) unstable; urgency=low - - * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a - database created by an older version of apt, an attempt will be made - to upgrade the database, but this may not work in all cases. If your - database is not automatically upgraded, delete it and allow it to be - recreated the next time. - - -- Matt Zimmerman Sat, 8 May 2004 12:38:07 -0700 - -- cgit v1.2.3-70-g09d2 From 65ea646c14385fef9852020a0a9432e7b567dcd5 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 19 Dec 2008 08:19:29 +0100 Subject: Galician translation update --- debian/changelog | 1 + po/ChangeLog | 4 ++ po/gl.po | 109 ++++++------------------------------------------------- 3 files changed, 16 insertions(+), 98 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d765c6a6..d0174400c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ apt (0.7.20) unstable; urgency=low [ Christian Perrier ] * Translations: - Finnish updated. Closes: #508449 + - Galician updated. Closes: #509151 -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 diff --git a/po/ChangeLog b/po/ChangeLog index a63e1c430..a6a725549 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2008-12-19 Marcelino Villarino + + * gl.po: updated to 539t. + 2008-12-12 Tapio Lehtonen * fi.po: updated to 539t. diff --git a/po/gl.po b/po/gl.po index c30a6ebf1..5bd403afc 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,18 +1,22 @@ +# translation of apt_po_gl.po to galician # Galician translation of apt # This file is put in the public domain. -# Jacobo Tarrío , 2005, 2007, 2008. # +# Jacobo Tarrío , 2005, 2007, 2008. +# mvillarino , 2008. msgid "" msgstr "" -"Project-Id-Version: apt\n" +"Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-07-28 22:28+0100\n" -"Last-Translator: Jacobo Tarrío \n" -"Language-Team: Galician \n" +"PO-Revision-Date: 2008-12-17 22:44+0100\n" +"Last-Translator: mvillarino \n" +"Language-Team: galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: cmdline/apt-cache.cc:143 #, c-format @@ -163,43 +167,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado o %s %s\n" #: cmdline/apt-cache.cc:1721 -#, fuzzy -#| msgid "" -#| "Usage: apt-cache [options] command\n" -#| " apt-cache [options] add file1 [file2 ...]\n" -#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -#| "\n" -#| "apt-cache is a low-level tool used to manipulate APT's binary\n" -#| "cache files, and query information from them\n" -#| "\n" -#| "Commands:\n" -#| " add - Add a package file to the source cache\n" -#| " gencaches - Build both the package and source cache\n" -#| " showpkg - Show some general information for a single package\n" -#| " showsrc - Show source records\n" -#| " stats - Show some basic statistics\n" -#| " dump - Show the entire file in a terse form\n" -#| " dumpavail - Print an available file to stdout\n" -#| " unmet - Show unmet dependencies\n" -#| " search - Search the package list for a regex pattern\n" -#| " show - Show a readable record for the package\n" -#| " depends - Show raw dependency information for a package\n" -#| " rdepends - Show reverse dependency information for a package\n" -#| " pkgnames - List the names of all packages\n" -#| " dotty - Generate package graphs for GraphViz\n" -#| " xvcg - Generate package graphs for xvcg\n" -#| " policy - Show policy settings\n" -#| "\n" -#| "Options:\n" -#| " -h This help text.\n" -#| " -p=? The package cache.\n" -#| " -s=? The source cache.\n" -#| " -q Disable progress indicator.\n" -#| " -i Show only important deps for the unmet command.\n" -#| " -c=? Read this configuration file\n" -#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -2110,9 +2077,8 @@ msgid "Error reading from server" msgstr "Erro ao ler do servidor" #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -#, fuzzy msgid "Failed to truncate file" -msgstr "Non se puido gravar o ficheiro %s" +msgstr "Non se puido truncar o ficheiro" #: methods/http.cc:1105 msgid "Bad header data" @@ -2137,7 +2103,7 @@ msgstr "Non se puido facer mmap de %lu bytes" #: apt-pkg/contrib/mmap.cc:213 msgid "Dynamic MMap ran out of room" -msgstr "" +msgstr "O MMap Dinámico esgotou o espazo" #: apt-pkg/contrib/strutl.cc:1014 #, c-format @@ -2950,56 +2916,3 @@ msgstr "Non se puido parchear o ficheiro" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Xa que só solicitou unha soa operación, é bastante probable que o\n" -#~ "paquete non sea instalable e que se deba informar dun erro no paquete." - -#~ msgid "Line %d too long (max %lu)" -#~ msgstr "Liña %d longa de máis (máximo %lu)" - -#, fuzzy -#~ msgid "Line %d too long (max %d)" -#~ msgstr "Liña %d longa de máis (máximo %u)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Ocorreu un erro ao procesar %s (NewFileDesc1)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Ocorreu un erro ao procesar %s (NewFileDesc2)" - -#, fuzzy -#~ msgid "Stored label: %s \n" -#~ msgstr "Etiqueta armacenada: %s \n" - -#, fuzzy -#~ msgid "" -#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" -#~ "i signatures\n" -#~ msgstr "" -#~ "Atopáronse %u índices de paquetes, %u índices de fontes, %u índices de " -#~ "traducións e %u sinaturas\n" - -#~ msgid "openpty failed\n" -#~ msgstr "Fallou a chamada a openpty\n" - -#~ msgid "File date has changed %s" -#~ msgstr "A data do ficheiro cambiou %s" - -#~ msgid "Reading file list" -#~ msgstr "A ler a lista de paquetes" - -#~ msgid "Could not execute " -#~ msgstr "Non se puido executar " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "A se preparar para a eliminación con config %s" - -#~ msgid "Removed with config %s" -#~ msgstr "Eliminouse con config %s" -- cgit v1.2.3-70-g09d2 From bbf55f8c66325fd0d9262730fb7af25fa25d2c5f Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Sun, 21 Dec 2008 16:01:31 +0200 Subject: Actualized COPYING file. --- COPYING | 151 ++++++------------------------------------------------- debian/changelog | 3 ++ 2 files changed, 19 insertions(+), 135 deletions(-) (limited to 'debian') diff --git a/COPYING b/COPYING index 3baf9ac5a..bba1b752b 100644 --- a/COPYING +++ b/COPYING @@ -1,142 +1,23 @@ Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. +Apt is currently developed by APT Development Team . -Apt is licensed under the terms of the GNU General Public License (GPL), -version 2.0 or later, as published by the Free Software Foundation. See -the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or - for the terms of the latest version -of the GNU General Public License. - -In addition, prior to November 15th, 2000, apt may be distributed under -terms identical to the above with the following addition: - -Works using apt may link against the GUI library "libqt", copyright by -Troll Tech AS, Norway, provided that: - -1. The version of "libqt" is licensed under the terms of the "Qt Free Edition - License" published by Troll Tech AS. The license terms identified as - the Qt Free Edition License below are the only such terms under which - distribution of works derived from both apt and "libqt" are permitted; - -and - -2. The source code of the version of "libqt" used is - - a) Distributed with the binary version; - - or - - b) Downloadable by anyone, without fee, using a publicly-announced - URL on the Internet, for a duration of at least three years - starting with distribution of the binary version. - -On and after November 15th, 2000, the above additional terms lose all -force, and apt will be licensed only under the terms of the GNU General -Public License, version 2.0 or later. - - _______________________________________________________________ - -The following text, up to the text of the Qt Free Edition License, is -informational and not part of the license terms on apt. - -Modifications to apt in either source or compiled form must be licensed -under the terms of the GNU General Public License, version 2.0 (or later), -but need not include the above clause permitting usage of the "libqt" -library under the Qt Free Edition License. Note that removal of this -clause will result in software which is not licensed for binary -redistribution linked against software governed by the Qt Free Edition -License. In the event that a version of "libqt" is released that is -licensed under terms that do not conflict with the GPL, the additional -clause above is not required to grant permission for distribution of works -that are derived from both apt and "libqt". - -No part of apt is licensed under the Qt Free Edition License. The terms -below are provided to help identify the circumstances under which the -"libqt" library may be used with apt (or a work derived from both). The -terms below are copied from the LICENSE file of the qt-1.44 distribution, -as of November 10th, 1999. - - _______________________________________________________________ - - QT FREE EDITION LICENSE +License: GPLv2+ -Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This is the license for Qt Free Edition version 1.44; it covers private use, -use of third-party application programs based on Qt, and development of -free software for the free software community. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - COPYRIGHT AND RESTRICTIONS - -The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited -to use with the X Window System. - -You may copy this version of the Qt Free Edition provided that the entire -archive is distributed unchanged and as a whole, including this notice. - -You may use this version of the Qt Free Edition to compile, link and run -application programs legally developed by third parties. - -You may use the Qt Free Edition to create application programs -provided that: - - You accept this license. - Your software does not require modifications to Qt Free Edition. - You satisfy ONE of the following three requirements - EITHER - Users of your software can freely obtain source code for the - software, freely modify the source code (possibly with - restrictions on copyright notices, attributions and legal - responsibility), and freely redistribute original or modified - versions of the software. - OR - Your software is distributed under the GNU GENERAL - PUBLIC LICENSE, version 2 or later, as defined by the - Free Software Foundation. - OR - Your software is distributed under the GNU LIBRARY - GENERAL PUBLIC LICENSE, version 2 or later, as - defined by the Free Software Foundation. - -If you are paid to develop something with Qt Free Edition or it is a part of -your job the following conditions also apply: - - Your software must not require libraries, programs, data or - documentation that are not available outside your organization in - order to compile or use. - If and when your organization starts using the software, you must - notify Troll Tech AS of the following: - Your organization's name and purpose. - The software's name and purpose. - The software's license. - That your organization considers the software to be free - software. - -You may also use the Qt Free Edition to create reusable components -(such as libraries) provided that you accept the terms above, and in -addition that: - - Your components' license includes the following text: - - [Your package] requires the Qt library, which is - copyright Troll Tech AS. Freely distributable - programs may generally use Qt Free Edition free of - charge, see [README.QT] for details. - - README.QT is distributed along with your components. - Qt Free Edition is not distributed as an integral part of your - components. - - LIMITATIONS OF LIABILITY - -Troll Tech AS makes no obligation under this license to support or -upgrade Qt Free Edition, or assist in the use of Qt Free Edition. - -In no event shall Troll Tech AS be liable for any lost revenue or profits or -other direct, indirect, special, incidental or consequential damages, even -if Troll Tech has been advised of the possibility of such damages. +See /usr/share/common-licenses/GPL-2, or + for the terms of the latest version +of the GNU General Public License. -QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, -INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. - _______________________________________________________________ diff --git a/debian/changelog b/debian/changelog index 0adbbac1b..758d7a4bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ apt (0.7.20) unstable; urgency=low and '{http,ftp}_proxy' environment variables are used only if options mentioned above are not specified. (Closes: #445985, #157759, #320184, #365880, #479617) + * COPYING: + - Actualized. Removed obsolete Qt section, added GPLv2 clause. + (Closes: #440049, #509337) [ Michael Vogt ] * add option to "apt-get build-dep" to mark the needed -- cgit v1.2.3-70-g09d2 From a37d207b2408eb22fca0b78796e30817a92b9a61 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Mon, 22 Dec 2008 21:47:15 +0100 Subject: Commit pending translations --- debian/changelog | 2 ++ po/ChangeLog | 8 ++++++++ po/ca.po | 26 ++++++++++++++++++++++++-- po/vi.po | 50 ++++++-------------------------------------------- 4 files changed, 40 insertions(+), 46 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d0174400c..97fc6b862 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ apt (0.7.20) unstable; urgency=low * Translations: - Finnish updated. Closes: #508449 - Galician updated. Closes: #509151 + - Catalan updated. Closes: #509375 + - Vietnamese updated. Closes: #509422 -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 diff --git a/po/ChangeLog b/po/ChangeLog index a6a725549..20e09c559 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2008-12-22 Clytie Siddall + + * vi.po: updated to 539t. + +2008-12-22 Jordi Mallach + + * ca.po: updated to 539t. + 2008-12-19 Marcelino Villarino * gl.po: updated to 539t. diff --git a/po/ca.po b/po/ca.po index 2a7108b31..abcaaf529 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: apt 0.7.19\n" +"Project-Id-Version: apt 0.7.20\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-13 08:00+0100\n" +"PO-Revision-Date: 2008-12-21 20:24+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" @@ -2925,6 +2925,28 @@ msgstr "No s'ha pogut aplicar el pedaç al fitxer" msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "" +#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-" +#~ "Limit. Current value: %lu. (man 5 apt.conf)" +#~ msgstr "" +#~ "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-" +#~ "Limit. Valor actual: %lu. (man 5 apt.conf)" + +#~ msgid "Release file expired, ignoring %s (valid until %s)" +#~ msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)" + +#~ msgid "Conflicting distribution: %s (expected %s but got %s)" +#~ msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" + +#~ msgid "Unable to parse Release file %s" +#~ msgstr "No es pot analitzar el fitxer Release %s" + +#~ msgid "No sections in Release file %s" +#~ msgstr "No hi ha seccions al fitxer Release %s" + +#~ msgid "No Hash entry in Release file %s" +#~ msgstr "No hi ha una entrada Hash al fitxer Release %s" + #~ msgid "" #~ "Since you only requested a single operation it is extremely likely that\n" #~ "the package is simply not installable and a bug report against\n" diff --git a/po/vi.po b/po/vi.po index 3ed56e592..31fa1e90d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-09-05 17:03+0930\n" +"PO-Revision-Date: 2008-12-22 19:04+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.7b3\n" +"X-Generator: LocFactoryEditor 1.8\n" #: cmdline/apt-cache.cc:143 #, c-format @@ -166,43 +166,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s cho %s được biên dịch trên %s %s\n" #: cmdline/apt-cache.cc:1721 -#, fuzzy -#| msgid "" -#| "Usage: apt-cache [options] command\n" -#| " apt-cache [options] add file1 [file2 ...]\n" -#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -#| "\n" -#| "apt-cache is a low-level tool used to manipulate APT's binary\n" -#| "cache files, and query information from them\n" -#| "\n" -#| "Commands:\n" -#| " add - Add a package file to the source cache\n" -#| " gencaches - Build both the package and source cache\n" -#| " showpkg - Show some general information for a single package\n" -#| " showsrc - Show source records\n" -#| " stats - Show some basic statistics\n" -#| " dump - Show the entire file in a terse form\n" -#| " dumpavail - Print an available file to stdout\n" -#| " unmet - Show unmet dependencies\n" -#| " search - Search the package list for a regex pattern\n" -#| " show - Show a readable record for the package\n" -#| " depends - Show raw dependency information for a package\n" -#| " rdepends - Show reverse dependency information for a package\n" -#| " pkgnames - List the names of all packages\n" -#| " dotty - Generate package graphs for GraphViz\n" -#| " xvcg - Generate package graphs for xvcg\n" -#| " policy - Show policy settings\n" -#| "\n" -#| "Options:\n" -#| " -h This help text.\n" -#| " -p=? The package cache.\n" -#| " -s=? The source cache.\n" -#| " -q Disable progress indicator.\n" -#| " -i Show only important deps for the unmet command.\n" -#| " -c=? Read this configuration file\n" -#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -240,7 +203,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Cách sử dụng: apt-cache [tùy_chọn...] lệnh\n" +"Sử dụng: apt-cache [tùy_chọn...] lệnh\n" " apt-cache [tùy_chọn...] add tập_tin1 [tập_tin2 ...]\n" " apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n" " apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n" @@ -280,7 +243,7 @@ msgstr "" "\t\t\tcho lệnh chưa thực hiện.\n" " -c=? \t\tĐọc tập tin _cấu hình_ này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" -"Để tìm thông tin thêm thì bạn hãy xem hai trang « man » (hướng dẫn)\n" +"Để tìm thông tin thêm, xem hai trang « man » (hướng dẫn)\n" "\t\t\tapt-cache(8) và apt.conf(5).\n" #: cmdline/apt-cdrom.cc:78 @@ -2138,9 +2101,8 @@ msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -#, fuzzy msgid "Failed to truncate file" -msgstr "Việc ghi tập tin %s bị lỗi" +msgstr "Lỗi cắt ngắn tập tin" #: methods/http.cc:1105 msgid "Bad header data" @@ -2165,7 +2127,7 @@ msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" #: apt-pkg/contrib/mmap.cc:213 msgid "Dynamic MMap ran out of room" -msgstr "" +msgstr "Hết chỗ tạo sơ đồ bộ nhớ động (Dynamic MMap)" #: apt-pkg/contrib/strutl.cc:1014 #, c-format -- cgit v1.2.3-70-g09d2 From 145e765f31ca38cc0051d97123c01b040c6d684a Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 4 Jan 2009 11:57:16 +0100 Subject: Added Traditional Chinese translation --- debian/changelog | 1 + po/ChangeLog | 4 + po/zh_TW.po | 1235 ++++++++++++++++++++++++++---------------------------- 3 files changed, 591 insertions(+), 649 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 97fc6b862..cfaa28b52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ apt (0.7.20) unstable; urgency=low - Galician updated. Closes: #509151 - Catalan updated. Closes: #509375 - Vietnamese updated. Closes: #509422 + - Traditional Chinese added. Closes: #510664 -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 diff --git a/po/ChangeLog b/po/ChangeLog index 20e09c559..9a5a0016b 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-01-04 Tetralet + + * zh_TW.po: Added as 538t1u. + 2008-12-22 Clytie Siddall * vi.po: updated to 539t. diff --git a/po/zh_TW.po b/po/zh_TW.po index e7a0376cf..296e58a24 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,9 +9,10 @@ msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-06-29 21:41+0800\n" -"Last-Translator: Asho Yeh \n" -"Language-Team: Chinese/Traditional \n" +"PO-Revision-Date: 2009-01-04 12:41+0800\n" +"Last-Translator: Tetralet \n" +"Language-Team: Debian-user in Chinese [Big5] \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,30 +20,30 @@ msgstr "" #: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "套件 %s 版本 %s 有未解決的相依問題:\n" +msgstr "套件 %s 版本 %s 未能滿足相依性：\n" #: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 #: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 #: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" -msgstr "無法找出套件 %s 的位置" +msgstr "找不到套件 %s" #: cmdline/apt-cache.cc:247 msgid "Total package names: " -msgstr "所有套件的名稱" +msgstr "套件名稱合計：" #: cmdline/apt-cache.cc:287 msgid " Normal packages: " -msgstr " 普通套件：" +msgstr " 一般套件：" #: cmdline/apt-cache.cc:288 msgid " Pure virtual packages: " -msgstr " 虛擬套件：" +msgstr " 完全虛擬套件：" #: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " 單虛擬套件：" +msgstr " 單一虛擬套件：" #: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " @@ -50,56 +51,56 @@ msgstr " 混合虛擬套件：" #: cmdline/apt-cache.cc:291 msgid " Missing: " -msgstr " 失蹤：" +msgstr " 找不到：" #: cmdline/apt-cache.cc:293 msgid "Total distinct versions: " -msgstr "所有不同版本" +msgstr "個別版本合計：" #: cmdline/apt-cache.cc:295 msgid "Total distinct descriptions: " -msgstr "所有不同版本的描述：" +msgstr "個別版本類別合計：" #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " -msgstr "所有依存關係：" +msgstr "相依關係合計：" #: cmdline/apt-cache.cc:300 msgid "Total ver/file relations: " -msgstr "所有版本/檔案關聯：" +msgstr "版本/檔案關聯合計：" #: cmdline/apt-cache.cc:302 msgid "Total Desc/File relations: " -msgstr "所有版本/檔案關聯： " +msgstr "類別/檔案關聯合計：" #: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " -msgstr "所有提供套件對應：" +msgstr "提供者對應合計：" #: cmdline/apt-cache.cc:316 msgid "Total globbed strings: " -msgstr "Glob 字串共計:" +msgstr "所有字串合計：" #: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "所有相依版本空間:" +msgstr "相依版本空間合計：" #: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Slack 空間共計:" +msgstr "間暇空間合計：" #: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "所有統計後的空間:" +msgstr "統計後的空間合計：" #: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "套件檔案 %s 已失去同步。" +msgstr "套件檔 %s 未同步。" #: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "您必須給定一完整的樣式" +msgstr "您必須明確得給定一個樣式" #: cmdline/apt-cache.cc:1447 msgid "No packages found" @@ -107,11 +108,11 @@ msgstr "未找到套件" #: cmdline/apt-cache.cc:1524 msgid "Package files:" -msgstr "套件檔案:" +msgstr "套件檔：" #: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "快取資料同步過時,無法 x-ref 套件檔案" +msgstr "快取資料未同步，無法 x-ref 套件檔" #: cmdline/apt-cache.cc:1532 #, c-format @@ -121,7 +122,7 @@ msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "鎖定的套件:" +msgstr "鎖定的套件：" #: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" @@ -130,25 +131,25 @@ msgstr "(未找到)" #. Installed version #: cmdline/apt-cache.cc:1577 msgid " Installed: " -msgstr "已安裝:" +msgstr " 已安裝：" #: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 msgid "(none)" -msgstr "(沒有)" +msgstr "(無)" #. Candidate Version #: cmdline/apt-cache.cc:1584 msgid " Candidate: " -msgstr " 候選:" +msgstr " 候選：" #: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " 套件鎖定: " +msgstr " 套件鎖定：" #. Show the priority tables #: cmdline/apt-cache.cc:1603 msgid " Version table:" -msgstr " 版本表格:" +msgstr " 版本列表：" #: cmdline/apt-cache.cc:1618 #, c-format @@ -160,46 +161,9 @@ msgstr " %4i %s\n" #: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s 是針對 %s 並在 %s %s 所編譯的\n" +msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" #: cmdline/apt-cache.cc:1721 -#, fuzzy -#| msgid "" -#| "Usage: apt-cache [options] command\n" -#| " apt-cache [options] add file1 [file2 ...]\n" -#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -#| "\n" -#| "apt-cache is a low-level tool used to manipulate APT's binary\n" -#| "cache files, and query information from them\n" -#| "\n" -#| "Commands:\n" -#| " add - Add a package file to the source cache\n" -#| " gencaches - Build both the package and source cache\n" -#| " showpkg - Show some general information for a single package\n" -#| " showsrc - Show source records\n" -#| " stats - Show some basic statistics\n" -#| " dump - Show the entire file in a terse form\n" -#| " dumpavail - Print an available file to stdout\n" -#| " unmet - Show unmet dependencies\n" -#| " search - Search the package list for a regex pattern\n" -#| " show - Show a readable record for the package\n" -#| " depends - Show raw dependency information for a package\n" -#| " rdepends - Show reverse dependency information for a package\n" -#| " pkgnames - List the names of all packages\n" -#| " dotty - Generate package graphs for GraphViz\n" -#| " xvcg - Generate package graphs for xvcg\n" -#| " policy - Show policy settings\n" -#| "\n" -#| "Options:\n" -#| " -h This help text.\n" -#| " -p=? The package cache.\n" -#| " -s=? The source cache.\n" -#| " -q Disable progress indicator.\n" -#| " -i Show only important deps for the unmet command.\n" -#| " -c=? Read this configuration file\n" -#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -237,57 +201,57 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"用法: apt-cache [選項] 命令\n" -" apt-cache [選項] add file1 [file2 ...]\n" -" apt-cache [選項] showpkg 套件1 [套件2 ...]\n" -" apt-cache [選項] showsrc 套件1 [套件2 ...]\n" +"用法：apt-cache [選項] 指令\n" +" apt-cache [選項] add 檔案1 [檔案2 ...]\n" +" apt-cache [選項] showpkg 套件1 [套件2 ...]\n" +" apt-cache [選項] showsrc 套件1 [套件2 ...]\n" "\n" -"apt-cache 是一個底層的工具,我們用它來操縱 APT 的二進制\n" -"快取檔案,也用來查詢那些檔案中的相關訊息\n" +"apt-cache 是一個低階的工具，可用來操作 APT 的二進制快取檔，也可用來\n" +"查詢那些檔案中的相關訊息\n" "\n" -"命令:\n" -" add - 往源碼快取中加入一個套件檔案\n" -" gencaches - 產生套件和源碼的快取\n" -" showpkg - 顯示套件的全面訊息\n" -" showsrc - 顯示源碼檔案的各項記錄\n" -" stats - 顯示一些基本的統計訊息\n" -" dump - 簡要顯示整個緩存文件的內容\n" -" dumpavail - 印出可取得的檔案到標準輸出(stdout)\n" +"指令:\n" +" add - 把套件檔加入原始碼快取中\n" +" gencaches - 同時產生套件和原始碼的快取\n" +" showpkg - 顯示某單一套件的一般資訊\n" +" showsrc - 顯示原始碼報告\n" +" stats - 顯示一些基本的統計資訊\n" +" dump - 簡要得顯示整個檔案\n" +" dumpavail - 將可用的檔案列印至標準輸出\n" " unmet - 顯示所有未滿足的相依關係\n" -" search - 根據正規表示法搜索套件列表\n" -" show - 顯示關於該套件的易於閱讀的報告\n" -" depends - 原原本本的顯示該套件的相依關係的訊息\n" -" rdepends - 顯示所有相依於該套件的套件名字\n" -" pkgnames - 列出所有套件的名稱\n" -" dotty - 產生 GraphViz 處理的套件關係圖\n" -" xvcg - 產生 xvcg 處理的套件的關係圖\n" -" policy - 顯示套件的安裝設定狀態\n" +" search - 根據正規表示式搜索套件列表\n" +" show - 顯示該套件的易於閱讀的報告\n" +" depends - 顯示該套件的原始相依關係的資訊\n" +" rdepends - 顯示所有相依於該套件的套件名稱\n" +" pkgnames - 列出系統中所有套件\n" +" dotty - 產生用於 GraphViz 的套件關係圖\n" +" xvcg - 產生用於 xvcg 的套件的關係圖\n" +" policy - 顯示套件的可安裝版本資訊\n" "\n" -"選項:\n" +"選項：\n" " -h 本幫助訊息。\n" " -p=? 套件的快取。\n" -" -s=? 源碼的快取。\n" +" -s=? 原始碼的快取。\n" " -q 關閉進度顯示。\n" -" -i 僅為 unmet 命令顯示重要的相依關係。\n" +" -i 僅為 unmet 指令顯示重要的相依關係。\n" " -c=? 讀取指定的設定檔\n" -" -o=? 設定任意指定的設定選項,例如 -o dir::cache=/tmp\n" -"若要深入了解,您還可以查閱 apt-cache(8) 和 apt.conf(5) 參考手冊。\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" +"請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "請給這張光碟取個名字，比如說“Debian 2.1r1 Disk 1”" +msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "請放入光碟至光碟機，然後按 [Enter] 鍵。" +msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "請對您的光碟套件中的其它光碟重復相同的操作。" +msgstr "請對您的光碟組中的其它光碟重複相同的操作。" #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "參數並非一對" +msgstr "參數並未成對" #: cmdline/apt-config.cc:76 msgid "" @@ -304,23 +268,23 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"用法:apt-config [選項] 命令\n" +"用法：apt-config [選項] 指令\n" "\n" -"apt-config 是一個用於讀取 APT 設定檔案的簡單工具\n" +"apt-config 是一個用於讀取 APT 設定檔的簡單工具\n" "\n" -"命令:\n" +"指令:\n" " shell - Shell 模式\n" -" dump - 顯示設定檔案\n" +" dump - 顯示設定\n" "\n" -"選項:\n" -" -h 本幫助訊息。\n" -" -c=? 讀取指定的設定檔案\n" -" -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" +"選項：\n" +" -h 本幫助訊息。\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s 不是合法的 DEB 套件" +msgstr "%s 並不是正確的 DEB 套件。" #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -335,25 +299,25 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"用法: apt-extracttemplates file1 [file2 ...]\n" +"用法：apt-extracttemplates 檔案1 [檔案2 ...]\n" "\n" -"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板\n" -"信息的工具\n" +"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n" +"的工具\n" "\n" -"選項:\n" -" -h 本幫助訊息。\n" -" -t 設定 temp 目錄\n" -" -c=? 讀取指定的設定檔案\n" -" -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" +"選項\n" +" -h 本幫助訊息。\n" +" -t 指定暫存目錄\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format msgid "Unable to write to %s" -msgstr "無法寫入『%s』。" +msgstr "無法寫入 %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "無法取得 debconf 版本。debconf 是否安裝?" +msgstr "無法取得 debconf 版本。是否有安裝 debconf？" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -364,20 +328,20 @@ msgstr "套件延伸列表過長" #: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" -msgstr "處理目錄 %s 時錯誤" +msgstr "處理目錄 %s 時發生錯誤" #: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "原碼的延伸列表太長" +msgstr "原始碼的延伸列表太長" #: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "寫入標頭資訊到目錄檔案時出錯" +msgstr "寫入標頭資訊到內容檔時發生錯誤" #: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "處理目錄 %s 時出錯" +msgstr "處理內容 %s 時發生錯誤" #: ftparchive/apt-ftparchive.cc:553 msgid "" @@ -420,44 +384,42 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"用法: apt-ftparchive [選項] 命令\n" -"命令: packages 二進制套件搜索路徑 [overridefile [pathprefix]]\n" -" sources 源碼搜索路徑 [overridefile [pathprefix]]\n" -" contents 搜索路徑\n" -" release 搜索路徑\n" -" generate 設定檔 [groups]\n" -" clean 設定檔\n" -"\n" -"apt-ftparchive 用來為 Debian 套件產生索引檔案。它支援\n" -"多種生成索引的方式，從自動化和功能性來說，是一套取代\n" -"dpkg-scanpackages 和 dpkg-scansources 的工具\n" +"用法：apt-ftparchive [選項] 指令\n" +"指令：packages 二進制檔搜索路徑 [重新定義檔 [路徑前綴]]\n" +" sources 原始碼搜索路徑 [重新定義檔 [路徑前綴]]\n" +" contents 搜索路徑\n" +" release 搜索路徑\n" +" generate 設定檔 [群組]\n" +" clean 設定檔\n" "\n" -"apt-ftparchive 能依據一個由 .deb 檔案構成的檔案樹產生 Package 檔案。\n" -"Package 檔案不僅包含每個套件的 MD5 校驗碼和檔案大小,\n" -"還有套件的所有控制字段的內容。同時支援 override 檔案,\n" -"它可以強制指套件的優先等級及其所屬的套件類別。\n" +"apt-ftparchive 可用來替 Debian 套件庫建立索引檔。它支援了從全\n" +"自動化到足以替代 dpkg-scanpackages 及 dpkg-scansources 所提供\n" +"的所有功能等等各式各樣建立索引的方式。apt-ftparchive 會根據 .deb 檔案樹建立 " +"Package 檔。Package 檔\n" +"裡不僅包含了每個套件的 control 資料的內容，還包含了 MD5 檢驗\n" +"碼和檔案大小。它還支援了重新定義檔，可用來強制指定優先等級及\n" +"其所屬的類別。\n" "\n" -"與上頭類似,apt-ftparchive 也能由 .dsc 的檔案樹生成 Source 檔案。\n" -"使用 --source-override 選項來指定一個 override 檔案\n" +"而同樣的，apt-ftparchive 也能根據 .dsc 檔案樹生成 Source 檔。\n" +"可用 --source-override 選項來指定一個 src 重新定義檔。\n" "\n" -"使用 'packages' 和 'source' 命令時,必須在檔案樹的根執行該程式。\n" -"二進制檔案的搜索路徑一定要是遞迴搜索的底層,\n" -"而且 override 檔案必須包含 override 旗標。如果 Pathprefix\n" -"存在則加到 filename 字段。\n" -"以 Debian 檔案庫舉例說明:\n" +"應當在檔案樹的根目錄下執行 'packages' 和 'source' 指令。\n" +"二進制檔的搜索路徑必須指向遞迴搜索的底層，且在重新定義檔裡必\n" +"須包含 override 旗標。若指定了路徑前綴時，則會被附加到檔案名\n" +"稱這個欄位裡。以 Debian 套件庫為例:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" "\n" -"選項:\n" +"選項：\n" " -h 本幫助說明\n" -" --md5 產生 MD5 校驗控制碼\n" -" -s=? 源碼的 override 檔案\n" -" -q 輸出精簡信息\n" -" -d=? 指定選擇的快取資料庫\n" -" --no-delink 開啟delink的偵錯模式\n" -" --contents 產生控制內容檔案\n" +" --md5 控制如何產生 MD5 檢驗碼\n" +" -s=? 原始碼的重新定義檔\n" +" -q 安靜模式\n" +" -d=? 指定搭配的快取資料庫\n" +" --no-delink 啟用 DeLinking 模式\n" +" --contents 產生控制內容檔\n" " -c=? 讀取指定的設定檔\n" -" -o=? 設定任意指定的設定選項" +" -o=? 指定任意的設定選項" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" @@ -466,28 +428,29 @@ msgstr "找不到符合的選項" #: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "套件檔案組 `%s' 缺少部份檔案" +msgstr "套件檔案組 `%s' 少了部份檔案" #: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB 已損毀,檔案被更名成 %s.old" +msgstr "DB 已損毀，檔案被更名為 %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB 過舊,嘗試更新 %s" +msgstr "DB 過舊，嘗試升級 %s" #: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." -msgstr "資料庫格式錯誤。如果您升級舊版的 apt，請移除並重建資料庫。" +msgstr "" +"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "無法開啟 DB 檔案 %s:%s" +msgstr "無法開啟 DB 檔 %s: %s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 @@ -497,21 +460,21 @@ msgstr "無法取得 %s 的狀態" #: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "檔案沒有 control 記錄" +msgstr "套件檔沒有 control 記錄" #: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "無法取得游標" +msgstr "無法取得遊標" #: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W:無法讀取目錄 %s\n" +msgstr "警告：無法讀取目錄 %s\n" #: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W:無法取得 %s 狀態\n" +msgstr "警告：無法取得 %s 狀態\n" #: ftparchive/writer.cc:132 msgid "E: " @@ -523,12 +486,12 @@ msgstr "警告：" #: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E:套用到檔案時出錯" +msgstr "錯誤：套用到檔案時發生錯誤" #: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "無法解析路徑 %s" +msgstr "無法解析 %s" #: ftparchive/writer.cc:170 msgid "Tree walking failed" @@ -542,22 +505,22 @@ msgstr "無法開啟 %s" #: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr " 移除連結 %s [%s]\n" +msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "無法讀取符號鏈接 %s" +msgstr "無法讀取連結 %s" #: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "無法 unlink %s" +msgstr "無法移除連結 %s" #: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** 無法將 %s 鏈接到 %s" +msgstr "*** 無法將 %s 連結到 %s" #: ftparchive/writer.cc:283 #, c-format @@ -566,36 +529,36 @@ msgstr " 達到了 DeLink 的上限 %sB。\n" #: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "檔案無套件字符" +msgstr "套件檔裡沒有套件資訊" #: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format msgid " %s has no override entry\n" -msgstr " %s 無 override 項目\n" +msgstr " %s 沒有重新定義項目\n" #: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s 套件維護者是 %s 非 %s\n" +msgstr " %s 的維護者是 %s，而非 %s\n" #: ftparchive/writer.cc:620 #, c-format msgid " %s has no source override entry\n" -msgstr " %s 無原始碼 override 項目\n" +msgstr " %s 沒有原始碼重新定義項目\n" #: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s 無二元碼 override 項目\n" +msgstr " %s 也沒有二元碼重新定義項目\n" #: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" -msgstr "內部錯誤：無法找到成員 %s" +msgstr "內部錯誤，找不找到成員 %s" #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - 無法配置記憶體空間" +msgstr "realloc - 無法配置記憶體" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format @@ -605,22 +568,22 @@ msgstr "無法開啟 %s" #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "override 文件 %s 第 %lu 行的格式有誤 #1" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1" #: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "override 文件 %s 第 %lu 行的格式有誤 #2" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2" #: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "override 文件 %s 第 %lu 行的格式有誤 #3" +msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "無法讀取 override 檔案 %s" +msgstr "無法讀取重新定義檔 %s" #: ftparchive/multicompress.cc:72 #, c-format @@ -630,11 +593,11 @@ msgstr "未知的壓縮演算法 '%s'" #: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "壓縮輸出 %s 需要一壓縮檔案集合" +msgstr "要壓縮輸出 %s 需搭配壓縮動作" #: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "無法建立 IPC 管線到子程序" +msgstr "無法和子程序建立 IPC 管線" #: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" @@ -651,7 +614,7 @@ msgstr "壓縮子程序" #: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "內部錯誤,無法建立 %s" +msgstr "內部錯誤，無法建立 %s" #: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" @@ -659,24 +622,24 @@ msgstr "無法建立子程序 IPC" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "無法執行壓縮程序" +msgstr "無法執行壓縮程式" #: ftparchive/multicompress.cc:360 msgid "decompressor" -msgstr "解壓縮程序" +msgstr "解壓縮程式" #: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "IO 到子程序/檔案失效" +msgstr "和子程序/檔案 IO 失敗" #: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "在計算 MD5 時無法讀取資料" +msgstr "在計算 MD5 時無法讀取到資料" #: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "在 unlink %s 時出錯" +msgstr "在取消 %s 的連結時發生問題" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format @@ -690,37 +653,37 @@ msgstr "Y" #: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" -msgstr "編譯正規表示法出錯 - %s" +msgstr "編譯正規表示式時發生錯誤 - %s" #: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" -msgstr "下列的套件有無法滿足的依存關係：" +msgstr "下列的套件有未滿足的相依關係：" #: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "但是『%s』卻已經安裝好了。" +msgstr "但 %s 卻已安裝" #: cmdline/apt-get.cc:333 #, c-format msgid "but %s is to be installed" -msgstr "但是『%s』卻將被安裝。" +msgstr "但 %s 卻將被安裝" #: cmdline/apt-get.cc:340 msgid "but it is not installable" -msgstr "但是它卻無法安裝。" +msgstr "但它卻無法安裝" #: cmdline/apt-get.cc:342 msgid "but it is a virtual package" -msgstr "但是它只是虛擬的套件" +msgstr "但它是虛擬套件" #: cmdline/apt-get.cc:345 msgid "but it is not installed" -msgstr "但是『』卻還沒有安裝。" +msgstr "但它卻尚未安裝" #: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" -msgstr "但是它卻不會被安裝。" +msgstr "但它卻將不會被安裝" #: cmdline/apt-get.cc:350 msgid " or" @@ -728,27 +691,27 @@ msgstr "或" #: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "下列的【新】套件都將被安裝：" +msgstr "下列【新】套件將會被安裝：" #: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" -msgstr "下列的套件都將被【刪除】：" +msgstr "下列套件將會被【移除】：" #: cmdline/apt-get.cc:427 msgid "The following packages have been kept back:" -msgstr "下列的套件都將維持舊版本:" +msgstr "下列套件將會維持其原有版本：" #: cmdline/apt-get.cc:448 msgid "The following packages will be upgraded:" -msgstr "下列的套件都將更新:" +msgstr "下列套件將會被升級：" #: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "下列的套件都將被「降級」:" +msgstr "下列套件將會被【降級】：" #: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" -msgstr "下列押後的套件都將被更改：" +msgstr "下列被保留 (hold) 的套件將會被更改：" #: cmdline/apt-get.cc:542 #, c-format @@ -760,49 +723,49 @@ msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"警告：下列的基本套件都將被移除。\n" -"除非您很清楚在做什麼，請勿輕易嘗試。" +"【警告】：下列的基本套件都將被移除。\n" +"除非您很清楚您在做什麼，否則請勿輕易嘗試！" #: cmdline/apt-get.cc:581 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "更新 %lu 個套件，新安裝 %lu 個套件，" +msgstr "升級 %lu 個，新安裝 %lu 個，" #: cmdline/apt-get.cc:585 #, c-format msgid "%lu reinstalled, " -msgstr "重新安裝 %lu 個套件，" +msgstr "重新安裝 %lu 個，" #: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "降 %lu 個套件的版，" +msgstr "降級 %lu 個，" #: cmdline/apt-get.cc:589 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "刪除 %lu 個套件，另不更新 %lu 個套件。\n" +msgstr "移除 %lu 個，有 %lu 個未被升級。\n" #: cmdline/apt-get.cc:593 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu 個套件沒有完全安裝或刪除完畢。\n" +msgstr "%lu 個沒有完整得安裝或移除。\n" #: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "更正依存關係中..." +msgstr "正在修正相依關係..." #: cmdline/apt-get.cc:670 msgid " failed." -msgstr "失敗" +msgstr " 失敗。" #: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" -msgstr "無法更正依存關係。" +msgstr "無法修正相依關係" #: cmdline/apt-get.cc:676 msgid "Unable to minimize the upgrade set" -msgstr "無法最小化升級的套件集合" +msgstr "無法將升級計劃最小化" #: cmdline/apt-get.cc:678 msgid " Done" @@ -810,94 +773,94 @@ msgstr " 完成" #: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "用『apt-get -f install』指令或許能修正這些問題。" +msgstr "您也許得執行 `apt-get -f install' 以修正這些問題。" #: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." -msgstr "無法滿足相依關係。試試看 -f 選項。" +msgstr "未能滿足相依關係。試試 -f 選項。" #: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "警告：下列的套件驗證失敗！" +msgstr "【警告】：無法驗證下列套件！" #: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "忽略了認證警告。\n" +msgstr "忽略了驗證警告。\n" #: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "不驗證這些套件就直接安裝？[y/N]" +msgstr "是否不經驗證就安裝這些套件？[y/N]" #: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "部份套件無法驗證" +msgstr "有部份套件無法驗證" #: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "出現一些問題,您使用了 -y 選項但是沒有用 --force-yes" +msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用" #: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "內部錯誤，InstallPackages 被用在了無法安裝的套上！" +msgstr "內部錯誤，在損毀的套件上執行 InstallPackages！" #: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "有套件需要被移除,但移除動作被禁止。" +msgstr "有套件需要被移除，但卻被禁止移除。" #: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "內部錯誤，Ordering didn't finish" +msgstr "內部錯誤，排序未能完成" #: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "無法鎖定下載的目錄" +msgstr "無法鎖定下載目錄" #: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." -msgstr "無法讀取來源單。" +msgstr "無法讀取來源列表。" #: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "怪了……檔案大小不符，發信給 apt@packages.debian.org 吧" +msgstr "怪哉... 檔案大小不符，請發信給 apt@packages.debian.org" #: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "需要下載 %2$sB 中 %1$sB 的檔案。\n" +msgstr "需要下載 %sB/%sB 的套件檔。\n" #: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "需要下載 %sB 的檔案。\n" +msgstr "需要下載 %sB 的套件檔。\n" #: cmdline/apt-get.cc:847 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "經過該處置後將消耗 %sB 的空間。\n" +msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n" #: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB disk space will be freed.\n" -msgstr "經過該處置後將空出 %sB 的空間。\n" +msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" -msgstr "%s 無法足夠的空間。" +msgstr "無法確認 %s 的未使用空間" #: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." -msgstr "『%s』內沒有足夠的空間。" +msgstr "在 %s 裡沒有足夠的的未使用空間。" #: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。" +msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。" #: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "是的,請執行我所指定的" +msgstr "Yes, do as I say!" #: cmdline/apt-get.cc:891 #, c-format @@ -906,8 +869,8 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"您的操作會導致潛在的危險\n" -"若要繼續的話,就輸入下面的句子“%s”\n" +"您所進行的操作可能會帶來危險。\n" +"請輸入 '%s' 這個句子以繼續進行\n" " ?] " #: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 @@ -916,36 +879,36 @@ msgstr "放棄執行。" #: cmdline/apt-get.cc:912 msgid "Do you want to continue [Y/n]? " -msgstr "繼續執行嗎？ 是按 [Y] 鍵，否按 [n] 鍵 " +msgstr "是否繼續進行 [Y/n]？" #: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "無法下載『%s』檔案。%s\n" +msgstr "無法取得 %s，%s\n" #: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "部份檔案無法下載" +msgstr "有部份檔案無法下載" #: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "下載完畢,目前是“僅下載”模式" +msgstr "下載完成，且這是『僅下載』模式" #: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n" -"選項?" +"有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選" +"項？" #: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)" +msgstr "目前尚未支援 --fix-missing 和媒體抽換" #: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "無法更正遺失的套件。" +msgstr "無法修正欠缺的套件。" #: cmdline/apt-get.cc:1019 msgid "Aborting install." @@ -954,22 +917,22 @@ msgstr "放棄安裝。" #: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "注意,選擇了 %s 而非 %s\n" +msgstr "注意，選擇了以 %s 替代 %s\n" #: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "忽略 %s,它已經被安裝而且沒有指定要升級。\n" +msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n" #: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "套件『%s』沒有安裝，所以無法刪除。\n" +msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n" #: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "虛擬套件『%s』的提供者是：\n" +msgstr "套件 %s 是虛擬套件，提供者為：\n" #: cmdline/apt-get.cc:1104 msgid " [Installed]" @@ -986,43 +949,42 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"現在沒有可用的套件 %s,但是它被其它的套件引用了。\n" -"這可能意味著這個套件已經消失或捨棄,\n" -"或者只能在其他原碼中找到\n" +"無法取得套件 %s，但它卻被其它的套件引用了。\n" +"這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n" #: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" -msgstr "但是下列的套件將取代它：" +msgstr "然而，下列的套件取代了它：" #: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s has no installation candidate" -msgstr "套件 %s 還沒有可供安裝的候選版本" +msgstr "套件 %s 沒有可安裝的候選版本" #: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "不能重新安裝 %s,因為無法下載它。\n" +msgstr "無法重新安裝 %s，因為它無法下載。\n" #: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "『%s』已經是最新版本了。\n" +msgstr "%s 已經是最新版本了。\n" #: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "未找到“%2$s”的“%1$s”發布版本" +msgstr "找不到 '%2$s' 的 '%1$s' 發行版" #: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "未找到“%2$s”的“%1$s”版本" +msgstr "找不到 '%s' 版的 '%s'" #: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "選定的版本為 %s (%s) 的 %s\n" +msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" #: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" @@ -1034,24 +996,25 @@ msgstr "無法鎖定列表目錄" #: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "我們將不刪除任何東西，無法啟動AutoRemover" +msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover" #: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "下列的套件都將自動安裝：" +msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" #: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." -msgstr "使用 'apt-get autoremove' 來移除這些" +msgstr "使用 'apt-get autoremove' 來將其移除。" #: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"恩，看起來AutoRemover損毀了某個東西，這不該發生的。請針對該 apt 發佈臭蟲。" +"嗯，看起來 AutoRemover 弄壞了什麼東西，而這是不該發生的。\n" +"請針對 apt 發佈錯誤回報。" #. #. if (Packages == 1) @@ -1065,7 +1028,7 @@ msgstr "" #. #: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" -msgstr "底下的資訊有助於解決現在的情況:" +msgstr "以下的資訊或許有助於解決當前的情況：" #: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" @@ -1073,22 +1036,22 @@ msgstr "內部錯誤，AutoRemover 處理失敗" #: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "內部錯誤,AllUpgrade 造成錯誤" +msgstr "內部錯誤，AllUpgrade 造成了損壞" #: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" -msgstr "無法找到 %s 作業。" +msgstr "無法找到主題 %s" #: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" -msgstr "無法找到 %s 套件。" +msgstr "無法找到套件 %s" #: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n" +msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n" #: cmdline/apt-get.cc:1692 #, c-format @@ -1097,15 +1060,15 @@ msgstr "%s 被設定為手動安裝。\n" #: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" -msgstr "用『apt-get -f install』指令或許能修正這些問題。" +msgstr "您也許得執行 `apt-get -f install' 以修正這些問題：" #: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n" -"定一個解決辦法)。" +"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解" +"決方案）。" #: cmdline/apt-get.cc:1720 msgid "" @@ -1114,9 +1077,8 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"有一些套件無法被安裝。這也許是系統無法實現您要求的狀態\n" -"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n" -"或從 Incoming 目錄移除。" +"有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" +"unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" #: cmdline/apt-get.cc:1738 msgid "Broken packages" @@ -1124,19 +1086,19 @@ msgstr "損毀的套件" #: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "下列的【新】套件都將被安裝：" +msgstr "下列的額外套件將被安裝：" #: cmdline/apt-get.cc:1856 msgid "Suggested packages:" -msgstr "建議(Suggested)的套件:" +msgstr "建議套件：" #: cmdline/apt-get.cc:1857 msgid "Recommended packages:" -msgstr "推薦(Recommended)的套件:" +msgstr "推薦套件：" #: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "籌畫升級套件中..." +msgstr "籌備升級中... " #: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" @@ -1148,65 +1110,65 @@ msgstr "完成" #: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" -msgstr "內部錯誤，problem resolver 處理失敗" +msgstr "內部錯誤，問題排除器造成了損壞" #: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "必須指定至少一個對應的套件才能下載源碼" +msgstr "在取得原始碼時必須至少指定一個套件" #: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" -msgstr "無法找到 %s 套件的源碼" +msgstr "無法找到 %s 的原始碼套件" #: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "略過已被下載的檔案“%s”\n" +msgstr "略過已下載的檔案 '%s'\n" #: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" -msgstr "『%s』內沒有足夠的空間。" +msgstr "在 %s 裡沒有足夠的的未使用空間" #: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n" +msgstr "需要下載 %sB/%sB 的原始套件檔。\n" #: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "需要下載 %sB 的原始檔案。\n" +msgstr "需要下載 %sB 的原始套件檔。\n" #: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "下載源碼 %s\n" +msgstr "取得原始碼 %s\n" #: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "無法下載某些檔案。" +msgstr "無法取得某些套件檔。" #: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "略過已經被解開到 %s 目錄的源碼檔案\n" +msgstr "不解開，因原始碼已解開至 %s\n" #: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "執行解開套件指令 '%s' 時失敗。\n" +msgstr "解開指令 '%s' 失敗。\n" #: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "請檢查是否安裝了“dpkg-dev”套件。\n" +msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" #: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "執行建立套件指令 '%s' 時失敗。\n" +msgstr "編譯指令 '%s' 失敗。\n" #: cmdline/apt-get.cc:2298 msgid "Child process failed" @@ -1214,24 +1176,24 @@ msgstr "子程序失敗" #: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" -msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)" +msgstr "在檢查編譯相依關係時必須至少指定一個套件" #: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "無法取得 %s 的建構相依關係。" +msgstr "無法取得 %s 的編譯相依關係資訊" #: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s 無建立相依關係訊息。\n" +msgstr "%s 沒有編譯相依關係。\n" #: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -msgstr "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係" +msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" #: cmdline/apt-get.cc:2467 #, c-format @@ -1239,31 +1201,30 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的" -"相依關係" +"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" #: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了" +msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了" #: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s" +msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" #: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "無法滿足套件 %s 所要求的建構相依關係。" +msgstr "無法滿足套件 %s 的編譯相依關係。" #: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" -msgstr "無法處理建構相依關係" +msgstr "無法處理編譯相依關係" #: cmdline/apt-get.cc:2578 msgid "Supported modules:" -msgstr "支援模組:" +msgstr "已支援模組：" #: cmdline/apt-get.cc:2619 msgid "" @@ -1308,44 +1269,44 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"用法: apt-get [選項] 命令\n" -" apt-get [選項] install|remove pkg1 [pkg2 ...]\n" -" apt-get [選項] source pkg1 [pkg2 ...]\n" +"用法：apt-get [選項] 指令\n" +" apt-get [選項] install|remove 套件1 [套件2 ...]\n" +" apt-get [選項] source 套件1 [套件2 ...]\n" "\n" -"apt-get 提供了一個用於下載和安裝套件的簡易命令界面。\n" -"最常用命令是 update 和 install。\n" +"apt-get 是一個用來下載和安裝套件的簡易命令列界面。\n" +"最常用指令是 update 和 install。\n" "\n" -"命令:\n" -" update - 取得套件的更新列表\n" -" upgrade - 進行一次升級\n" -" install - 安裝新的套件(注:套件名稱是 libc6 而非 libc6.deb)\n" -" remove - 移除套件(保留設定檔)\n" -" autoremove·-·自動移除未使用到的套件\n" -" purge·-·完整移除套件(刪除設定檔)\n" +"指令:\n" +" update - 取得新的套件列表\n" +" upgrade - 進行升級\n" +" install - 安裝新套件（套件名稱是 libc6 而不是 libc6.deb）\n" +" remove - 移除套件\n" +" autoremove - 自動移除所有不再使用的套件\n" +" purge - 移除並清除套件\n" " source - 下載套件原始碼\n" -" build-dep - 為原始碼套件設定建構的相依關係\n" -" dist-upgrade - 發行版本升級,參閱 apt-get(8)\n" -" dselect-upgrade·-·採用 dselect·的選項升級\n" -" clean - 刪除所有已下載的套件檔案\n" -" auto-clean - 刪除已下載的套件檔案較舊的版本\n" -" check - 核對以確認系統的相依關係的完整性\n" +" build-dep - 為原始碼套件配置編譯相依關係\n" +" dist-upgrade - 發行版本升級，請參閱 apt-get(8)\n" +" dselect-upgrade - 採用 dselect 的選項升級\n" +" clean - 刪除已下載的套件檔\n" +" auto-clean - 刪除已下載但已有新版本的套件檔\n" +" check - 檢查相依關係是否有問題\n" "\n" -"選項:\n" +"選項：\n" " -h 本求助訊息。\n" -" -q 讓輸出作為記錄檔 - 不顯示進度\n" -" -qq 除了錯誤外,皆不產生任何訊息\n" -" -d 僅下載 - 『不』安裝或解開套件檔案\n" -" -s 不作實際操作。只是模擬執行命令\n" -" -y 對所有詢問都作肯定的回答,同時不作任何提示\n" -" -f 嘗試修正系統損毀的套件相依關係\n" -" -m 當有套件檔案無法找到時,仍嘗試繼續執行\n" +" -q 讓輸出可作為記錄檔之用 - 不顯示進度\n" +" -qq 除了錯誤外，不顯示其它資訊\n" +" -d 僅下載 - 【不】安裝或解開套件檔\n" +" -s 不實際進行。只是模擬執行指令\n" +" -y 對所有詢問都回答 Yes，同時不會有任何提示\n" +" -f 嘗試修正系統上損毀的套件相依關係\n" +" -m 當有套件檔無法找到時，仍試著繼續進行\n" " -u 顯示已升級的套件列表\n" -" -b 在下載完套件原始碼後,編譯產生對應的套件\n" +" -b 在取得套件原始碼後進行編譯\n" " -V 顯示詳盡的版本號碼\n" -" -c=? 讀取指定的設定檔案\n" -" -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" -"請參閱 apt-get(8)、sources.list(5) 和 apt.conf(5)的使用手冊\n" -"以取得更多訊息和選項。\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" +"請參閱 apt-get(8)、sources.list(5) 及 apt.conf(5) 的使用手冊\n" +"以取得更多資訊和選項。\n" " 該 APT 有著超級牛力。\n" #: cmdline/acqprogress.cc:55 @@ -1367,7 +1328,7 @@ msgstr "錯誤 " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "讀取 %sB 用了 %s (%sB/s)\n" +msgstr "取得 %sB 用了 %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1381,13 +1342,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"更換媒體:請把名為\n" -" '%s' 的光碟\n" -"插入 '%s' 碟機,然後按 [Enter] 鍵。\n" +"更換媒體：請把以下名稱的光碟\n" +" '%s'\n" +"放入 '%s' 裝置，然後按 [Enter] 鍵\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "未知的套件記錄!" +msgstr "未知的套件記錄！" #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1402,41 +1363,40 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"用法: apt-sortpkgs [選項] file1 [file2 ...]\n" +"用法：apt-sortpkgs [選項] 檔案1 [檔案2 ...]\n" "\n" -"apt-sortpkgs 是對套件索引檔案內容進行排序的簡單工具。-s 選項\n" -"是用來指出該檔的檔案類型。\n" +"apt-sortpkgs 是用來排序套件檔的簡單工具。-s 選項是用來指定它的檔案類型。\n" "\n" -"選項:\n" -" -h 本幫助訊息。\n" -" -s 根據源碼檔案排序\n" -" -c=? 讀取指定的設定檔案\n" -" -o=? 設定任意指定的設定選項,例如:-o dir::cache=/tmp\n" +"選項：\n" +" -h 本幫助訊息。\n" +" -s 根據原始檔排序\n" +" -c=? 讀取指定的設定檔\n" +" -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "錯誤的預設設定!" +msgstr "錯誤的預設設定！" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "請按 [Enter] 鍵繼續。" +msgstr "請按 [Enter] 鍵以繼續進行。" #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "您想移除任何先前下載的 deb 檔案嗎？" +msgstr "您想移除所有先前下載的 .deb 檔嗎？" #: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "解開套件時發生錯誤。我要準備設定" +msgstr "在解開套件時發生錯誤。我要準備設定" #: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" -msgstr "套件已安裝過。這將造成重複性的錯誤" +msgstr "套件已安裝過。這會造成重複錯誤" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "或因為失去相依關係所造成的錯誤。只有該錯誤可被容忍" +msgstr "或是因為沒有相依關係而造成錯誤。那麼這個錯誤是無關緊要的" #: dselect/install:104 msgid "" @@ -1445,7 +1405,7 @@ msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]" #: dselect/update:30 msgid "Merging available information" -msgstr "結合現有資料中" +msgstr "整合現有的資料" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1457,62 +1417,62 @@ msgstr "無法執行 gzip" #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" -msgstr "損毀的檔案" +msgstr "損毀的套件檔" #: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Tar checksum 失敗,檔案已損毀" +msgstr "Tar checksum 失敗，套件檔已損毀" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "未知的 TAR 標頭型別 %u, member 訊息 %s" +msgstr "未知的 TAR 標頭類型 %u，成員 %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "無效的檔案籤章" +msgstr "無效的套件庫簽章" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "讀取檔案 member 標頭訊息時出錯" +msgstr "讀取套件檔的成員標頭訊息時發生錯誤" #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "無效的檔案 member 標頭" +msgstr "無效的套件檔成員標頭" #: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "檔案過短" +msgstr "套件檔過短" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "讀取檔案標頭失敗" +msgstr "讀取套件檔標頭失敗" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode 在還有 linked node 時被呼叫" +msgstr "DropNode 在還有連結結點時被呼叫" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "尋找雜湊元件失敗!" +msgstr "找不到雜湊元件！" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "分配轉移(diversion)失敗" +msgstr "在配置轉移資訊時失敗" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" -msgstr "內部錯誤於 AddDiversion" +msgstr "在 AddDiversion 發生了內部錯誤" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "試圖改寫一個轉移(diversion)，%s -> %s 和 %s/%s" +msgstr "試圖改寫轉移資訊，%s -> %s 和 %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "重複加入轉移(diversion) %s -> %s" +msgstr "重複加入轉移資訊 %s -> %s" #: apt-inst/filelist.cc:549 #, c-format @@ -1542,21 +1502,21 @@ msgstr "解開 %s 超過一次" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "路徑 %s 已被轉向(diverted)" +msgstr "路徑 %s 已被轉移" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "此套件試圖寫入改變過的目標 %s/%s" +msgstr "此套件試圖寫至轉移後的目標 %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "轉移(diversion)路徑過長" +msgstr "要進行轉移的路徑過長" #: apt-inst/extract.cc:240 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "目錄 %s 已經被非目錄檔案取代" +msgstr "目錄 %s 已經被非目錄的檔案所取代" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" @@ -1569,24 +1529,24 @@ msgstr "路徑過長" #: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "複寫套件 %s 無符合版本" +msgstr "以無版本的 %s 覆寫原始套件" #: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "檔案 %s/%s 複寫套件 %s 中的相同檔案" +msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format msgid "Unable to read %s" -msgstr "無法讀取『%s』。" +msgstr "無法讀取 %s" #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "無法讀取 %s 的資料" +msgstr "無法取得 %s 的狀態" #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format @@ -1596,28 +1556,28 @@ msgstr "無法移除 %s" #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "無法創造 %s" +msgstr "無法建立 %s" #: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "無法讀取 %s 的資料" +msgstr "無法取得 %sinfo 的狀態" #: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "資料目錄與暫存目錄需在同一檔案系統" +msgstr "資料目錄與暫存目錄需位於同一檔案系統中" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760 #: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834 #: apt-pkg/pkgcachegen.cc:957 msgid "Reading package lists" -msgstr "讀取套件清單中" +msgstr "正在讀取套件清單" #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "無法變換 admin 目錄至 %sinfo" +msgstr "無法切換至管理者目錄 %sinfo" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 @@ -1626,7 +1586,7 @@ msgstr "內部錯誤，無法取得套件名稱" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "讀取軟件表中" +msgstr "正在讀取檔案清單" #: apt-inst/deb/dpkgdb.cc:212 #, c-format @@ -1635,13 +1595,13 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"讀取清單檔案「%sinfo/%s」失敗。如果您無法還原此檔案\n" -"請使檔案空白並馬上重新安裝相同版本的套件。" +"無法開啟清單檔 %sinfo/%s。如果您無法將此檔案還原，請清除檔案內容，然後立即重" +"新安裝同一版本的套件！" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "讀取清單檔案「%sinfo/%s」失敗" +msgstr "無法讀取清單檔 %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" @@ -1650,21 +1610,21 @@ msgstr "內部錯誤，無法取得節點" #: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "讀取轉移檔案 %sdiversions 失敗" +msgstr "讀取轉移檔 %sdiversions 失敗" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "套件轉移檔損壞" +msgstr "轉移檔已損壞" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "無效的行於轉移檔案 %s 中" +msgstr "在轉移檔中的這一行有誤：%s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "內部錯誤：新增轉移(diversion)失敗" +msgstr "內部錯誤：在新增轉移資料時發生錯誤" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -1673,32 +1633,32 @@ msgstr "套件快取必須先初始化" #: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "開啟套件失敗：檔案標頭，位移(offset) %lu" +msgstr "找不到套件：檔案標頭，位移 %lu" #: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "壞的 ConfFile 區段於 status 檔案。位移(offset) %lu" +msgstr "在 status 檔中的 ConfFile 區段損壞。位移 %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "解析 MD5 錯誤。位移(offset) %lu" +msgstr "在解析 MD5 時發生錯誤。位移 %lu" #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "無效的 DEB 檔案，遺失 %s 成員" +msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員" #: apt-inst/deb/debfile.cc:50 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "無效的 DEB 檔案，遺失 '%s', '%s' 或 '%s' 成員" +msgstr "這是個不正確的 DEB 套件檔，沒有 '%s', '%s' 或 '%s' 成員" #: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "無法變換目錄至 %s" +msgstr "無法切換至 %s" #: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" @@ -1706,37 +1666,36 @@ msgstr "內部錯誤：無法找到成員" #: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "找不到有效的 control 檔案" +msgstr "找不到可用的 control 檔" #: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "無法分析的 control 檔案" +msgstr "無法分析的 control 檔" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "無法讀取碟片資料庫『%s』。" +msgstr "無法讀取光碟片資料庫 %s" #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"要讓本程式辨認此碟片，請用『apt-cdrom』工具。『apt-get update』不能用來製造新" -"的碟片。" +"請用 apt-cdrom 來讓 APT 能辨識這張光碟。apt-get update 是不能用來新增光碟的" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "碟片不正確。" +msgstr "不正確的光碟" #: methods/cdrom.cc:166 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "無法下駕『%s』內的碟片，或許它仍在使用中。" +msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。" #: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "找不到磁碟" +msgstr "找不到磁碟。" #: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" @@ -1745,15 +1704,15 @@ msgstr "找不到檔案" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 #: methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" -msgstr "無法讀取資料" +msgstr "無法取得狀態" #: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "日期更新失敗" +msgstr "無法設定修改時間" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "通用資源識別號錯誤。本機資源識別號不應以『//』起頭。" +msgstr "不正確的 URI，本機 URI 不應以 // 開頭" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1762,42 +1721,43 @@ msgstr "登入中" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "無法解析對方主機名稱。" +msgstr "無法解析對方主機名稱" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "無法解析本機名稱。" +msgstr "無法解析本機名稱" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "伺服器因『%s』不受理。" +msgstr "伺服器不接受連線，並回應：%s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "『USER』指令因『%s』失敗。" +msgstr "USER 指令失敗，伺服器回應：%s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "『PASS』指令因『%s』失敗。" +msgstr "PASS 指令失敗，伺服器回應：%s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." -msgstr "媒介伺服器設定應包括登入稿。" +msgstr "" +"指定了代理伺服器，但沒有指定登入 script，Acquire::ftp::ProxyLogin 是空的。" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "登入稿『%s』因『%s』失敗。" +msgstr "登入 script 指令 '%s' 失敗，伺服器回應：%s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "『TYPE』指令因『%s』失敗。" +msgstr "TYPE 指令失敗，伺服器回應：%s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1805,23 +1765,23 @@ msgstr "連線逾時" #: methods/ftp.cc:335 msgid "Server closed the connection" -msgstr "伺服器關閉聯線。" +msgstr "伺服器已關閉連線" #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 msgid "Read error" -msgstr "讀取失敗。" +msgstr "讀取錯誤" #: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "答覆超過緩衝區長度。" +msgstr "回應超過緩衝區長度。" #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "協定失敗。" +msgstr "協定失敗" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" -msgstr "寫入失敗。" +msgstr "寫入錯誤" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" @@ -1829,23 +1789,23 @@ msgstr "無法建立 Socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "無法連接到 data socket，連線逾時" +msgstr "無法和 data socket 連線，連線逾時" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "無法連接到 passive socket" +msgstr "無法和 passive socket 連線。" #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo 無法取得監聽的 socket" +msgstr "getaddrinfo 無法取得監聽 socket" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "無法連接(bind) socket" +msgstr "無法 bind 至 socket" #: methods/ftp.cc:740 msgid "Could not listen on the socket" -msgstr "無法在 socket 上接收資料" +msgstr "無法監聽 socket" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" @@ -1853,17 +1813,17 @@ msgstr "無法解析 socket 名稱" #: methods/ftp.cc:779 msgid "Unable to send PORT command" -msgstr "無法送出「PORT」命令" +msgstr "無法送出 PORT 指令" #: methods/ftp.cc:789 #, c-format msgid "Unknown address family %u (AF_*)" -msgstr "未知的地址成員 %u (AF_*)" +msgstr "未知的地址家族 %u (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT 失敗，伺服器回應：%s" +msgstr "EPRT 指令失敗，伺服器回應：%s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" @@ -1871,16 +1831,16 @@ msgstr "Data socket 連線逾時" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "無法允許連線" +msgstr "無法接受連線" #: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "問題雜湊表" +msgstr "有問題的雜湊檔" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "無法取得檔案，伺服器回應：%s" +msgstr "無法取得檔案，伺服器回應 '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1889,7 +1849,7 @@ msgstr "Data socket 連線逾時" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "資料傳輸失敗，伺服器回應 %s" +msgstr "資料傳輸失敗，伺服器回應 '%s'" #. Get the files information #: methods/ftp.cc:997 @@ -1898,12 +1858,12 @@ msgstr "查詢" #: methods/ftp.cc:1109 msgid "Unable to invoke " -msgstr "無法讀取 " +msgstr "無法 invoke " #: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "連絡『%s (%s)』中" +msgstr "正和 %s (%s) 連線" #: methods/connect.cc:81 #, c-format @@ -1913,86 +1873,86 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "無法建立到『%s』的 socket (族=%u 型=%u 協定=%u)。" +msgstr "無法建立 socket 指向 %s (f=%u t=%u p=%u)" #: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "無法聯絡到主機『%s:%s (%s)』。" +msgstr "無法初始和 %s:%s (%s) 的連線。" #: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "無法聯絡到主機『%s:%s (%s)』。" +msgstr "無法和 %s:%s (%s) 連線，連線逾時" #: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "無法聯絡到主機『%s:%s (%s)』。" +msgstr "無法和 %s:%s (%s) 連線。" #. We say this mainly because the pause here is for the #. ssh connection that is still going #: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "聯絡主機『%s』中" +msgstr "正連線至 %s" #: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "無法解析位置 %s" +msgstr "無法解析 '%s'" #: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "解析『%s』暫時失敗" +msgstr "暫時無法解析 '%s'" #: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "無法解析『%s:%s (%i)』。" +msgstr "在解析 '%s:%s' (%i) 時出了怪事" #: methods/connect.cc:240 #, c-format msgid "Unable to connect to %s %s:" -msgstr "無法聯絡到主機『%s %s』：" +msgstr "無法連線至 %s %s：" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "無法存取keyring：%s" +msgstr "無法存取鑰匙圈：'%s'" #: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "錯誤：Acquire::gpgv::Options 的參數列表超長。結束執行。" +msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。" #: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "內部錯誤：簽名正確無誤，但是無法確認密鑰的指紋(key fingerprint)？！" +msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" #: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "至少發現一個無效的簽名。" +msgstr "至少發現一個無效的簽章。" #: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" -msgstr "無法執行“%s”來驗證簽名(您安裝了 gpgv 嗎？)" +msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" #: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" -msgstr "執行 gpgv 時發生未知錯誤" +msgstr "在執行 gpgv 時發生未知的錯誤" #: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" -msgstr "下列的簽名皆不合法：\n" +msgstr "以下簽名無效：\n" #: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "由於沒有公鑰，下列簽名無法進行驗證：\n" +msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n" #: methods/gzip.cc:64 #, c-format @@ -2002,7 +1962,7 @@ msgstr "無法開啟管線給 %s 使用" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" -msgstr "從 %s 進程讀取錯誤" +msgstr "由 %s 程序讀取錯誤" #: methods/http.cc:377 msgid "Waiting for headers" @@ -2015,23 +1975,23 @@ msgstr "取得一個單行超過 %u 字元的標頭" #: methods/http.cc:531 msgid "Bad header line" -msgstr "壞的標頭" +msgstr "標頭行錯誤" #: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" -msgstr "http 伺服器傳送一個無效的回覆標頭" +msgstr "HTTP 伺服器傳送了一個無效的回覆標頭" #: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "http 伺服器傳送一個無效的 Content-Length 標頭" +msgstr "HTTP 伺服器傳送了一個無效的 Content-Length 標頭" #: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "http 伺服器傳送一個無效的 Content-Range 標頭" +msgstr "HTTP 伺服器傳送了一個無效的 Content-Range 標頭" #: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "http 伺服器有損毀的範圍支援" +msgstr "這個 HTTP 伺服器的範圍支援有問題" #: methods/http.cc:627 msgid "Unknown date format" @@ -2039,7 +1999,7 @@ msgstr "未知的資料格式" #: methods/http.cc:774 msgid "Select failed" -msgstr "Select 失敗" +msgstr "選擇失敗" #: methods/http.cc:779 msgid "Connection timed out" @@ -2047,32 +2007,31 @@ msgstr "連線逾時" #: methods/http.cc:802 msgid "Error writing to output file" -msgstr "寫入輸出檔時發生錯誤" +msgstr "在寫入輸出檔時發生錯誤" #: methods/http.cc:833 msgid "Error writing to file" -msgstr "寫入檔案時發生錯誤" +msgstr "在寫入檔案時發生錯誤" #: methods/http.cc:861 msgid "Error writing to the file" -msgstr "寫入檔案時發生錯誤" +msgstr "在寫入該檔時發生錯誤" #: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "從遠端主機讀取錯誤，關閉連線" +msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" #: methods/http.cc:877 msgid "Error reading from server" -msgstr "從伺服器讀取發生錯誤" +msgstr "在讀取伺服器時發生錯誤" #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 -#, fuzzy msgid "Failed to truncate file" -msgstr "寫入檔案 %s 失敗" +msgstr "無法截短檔案" #: methods/http.cc:1105 msgid "Bad header data" -msgstr "壞的標頭資料" +msgstr "錯誤的標頭資料" #: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" @@ -2084,12 +2043,12 @@ msgstr "內部錯誤" #: apt-pkg/contrib/mmap.cc:80 msgid "Can't mmap an empty file" -msgstr "不能將空白檔案讀入記憶體" +msgstr "不能 mmap 空白檔案" #: apt-pkg/contrib/mmap.cc:85 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "無法讀入檔案 %lu 位元組至記憶體" +msgstr "無法 mmap 到 %lu 位元組" #: apt-pkg/contrib/mmap.cc:213 msgid "Dynamic MMap ran out of room" @@ -2098,57 +2057,57 @@ msgstr "" #: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" -msgstr "選項『%s』找不到。" +msgstr "選項 %s 找不到" #: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "不認識的簡寫類型：%c" +msgstr "無法辨識的縮寫類型：'%c'" #: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "開啟組態檔 %s" +msgstr "開啟設定檔 %s" #: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "語法錯誤 %s:%u: 區塊沒有名稱" +msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。" #: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "語法錯誤 %s:%u: 無效的標籤" +msgstr "語法錯誤 %s:%u：標籤格式錯誤" #: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "語法錯誤 %s:%u: 值後有多餘的垃圾" +msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "語法錯誤： %s:%u： 指令只能於最高層級執行" +msgstr "語法錯誤 %s:%u：指令只能於最高層級執行" #: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "語法錯誤 %s:%u: 太多重複引入檔案" +msgstr "語法錯誤 %s:%u: 太多巢狀引入檔" #: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "語法錯誤 %s:%u: 從此引入" +msgstr "語法錯誤 %s:%u：從此引入" #: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "語法錯誤 %s:%u: 不支援的指令 '%s'" +msgstr "語法錯誤 %s:%u：不支援的指令 '%s'" #: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "語法錯誤 %s:%u: 檔案後有多餘的垃圾" +msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾" #: apt-pkg/contrib/progress.cc:153 #, c-format @@ -2163,7 +2122,7 @@ msgstr "%c%s... 完成" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "未知的命令列選項「%c」從 %s" +msgstr "未知的命令列選項 '%c' [來自 %s]。" #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 @@ -2174,22 +2133,22 @@ msgstr "無法理解的命令列選項 %s" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "命令列選項 %s 不是布林(boolean)變數" +msgstr "命令列選項 %s 不是 boolean 值" #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "選項 %s 需要更多的參數" +msgstr "需替選項 %s 指定參數。" #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "選項 %s： 組態元件描述應該有 =" +msgstr "選項 %s：在指定設定項目時應該有 =。" #: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "選項 %s 需要整數參數，不是 %s" +msgstr "選項 %s 的參數應該是數字，而不是 '%s'" #: apt-pkg/contrib/cmndline.cc:265 #, c-format @@ -2199,62 +2158,62 @@ msgstr "選項 %s 太長" #: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "偵測器 %s 無法理解，試試 true 或 false" +msgstr "偵測器 %s 無法理解，試試 true 或 false。" #: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "無效的操作：%s" +msgstr "無效的操作 %s" #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "無法讀取掛載點 %s" +msgstr "無法取得掛載點 %s 的狀態" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 #: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" -msgstr "無法進入『%s』目錄。" +msgstr "無法切換至 %s" #: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "CD-ROM 狀況讀取失敗" +msgstr "無法取得 CD-ROM 的狀態" #: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "不使用檔案鎖定於唯獨檔案 %s" +msgstr "不在唯讀檔案 %s 上使用檔案鎖定" #: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "無法開啟『%s』鎖定檔。" +msgstr "無法開啟鎖定檔 %s" #: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "不使用檔案鎖定於 nfs 掛載點上得檔案 %s" +msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定" #: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "無法取得『%s』鎖。" +msgstr "無法將 %s 鎖定" #: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "等待 %s 但是它不存在" +msgstr "等待 %s 但是它並不存在" #: apt-pkg/contrib/fileutl.cc:454 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "子程序 %s 收到一個記憶體錯誤" +msgstr "子程序 %s 收到一個記憶體錯誤。" #: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "子程序 %s 回傳錯誤碼(%u)" +msgstr "子程序 %s 傳回錯誤碼 (%u)" #: apt-pkg/contrib/fileutl.cc:459 #, c-format @@ -2264,58 +2223,58 @@ msgstr "子程序 %s 不預期的結束" #: apt-pkg/contrib/fileutl.cc:503 #, c-format msgid "Could not open file %s" -msgstr "無法開啟『%s』檔案。" +msgstr "無法開啟檔案 %s" #: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "讀取，仍有 %lu 未讀" +msgstr "讀取，仍有 %lu 未讀但已無空間" #: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "寫入，仍有 %lu 待寫入但無法寫入" +msgstr "寫入，仍有 %lu 待寫入但已沒辨法" #: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "程式關閉檔案" +msgstr "在關閉檔案時發生問題" #: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "程式刪除檔案" +msgstr "在刪除檔案時發生問題" #: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" -msgstr "程式同步檔案" +msgstr "在同步檔案時發生問題" #: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "套件暫存檔是空的。" +msgstr "清空套件快取" #: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "套件暫存檔損壞。" +msgstr "套件快取檔損壞" #: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "套件暫存檔版本不符合。" +msgstr "套件快取檔版本不符" #: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "本軟體不支持『%s』版本系統。" +msgstr "本 APT 不支援 '%s' 版本系統" #: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "套件暫存檔是在另一種系統上產生的。" +msgstr "這個套件快取是用於另一種平台的" #: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "依存關係" +msgstr "相依關係" #: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "特別依存關係" +msgstr "預先相依關係" #: apt-pkg/pkgcache.cc:224 msgid "Suggests" @@ -2335,11 +2294,11 @@ msgstr "取代" #: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "淘汰" +msgstr "廢棄" #: apt-pkg/pkgcache.cc:226 msgid "Breaks" -msgstr "Breaks" +msgstr "毀損" #: apt-pkg/pkgcache.cc:237 msgid "important" @@ -2359,11 +2318,11 @@ msgstr "次要" #: apt-pkg/pkgcache.cc:238 msgid "extra" -msgstr "添加" +msgstr "額外" #: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "了解套件依存關係中" +msgstr "正在重建相依關係" #: apt-pkg/depcache.cc:122 msgid "Candidate versions" @@ -2371,81 +2330,81 @@ msgstr "候選版本" #: apt-pkg/depcache.cc:151 msgid "Dependency generation" -msgstr "產生套件依存關係" +msgstr "建立相依關係" #: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 msgid "Reading state information" -msgstr "讀取狀態資料中" +msgstr "正在讀取狀態資料" #: apt-pkg/depcache.cc:219 #, c-format msgid "Failed to open StateFile %s" -msgstr "無法開啟狀態檔案%s" +msgstr "無法開啟 StateFile %s" #: apt-pkg/depcache.cc:225 #, c-format msgid "Failed to write temporary StateFile %s" -msgstr "寫入暫存的狀態檔案 %s 失敗" +msgstr "無法寫入暫存的 StateFile %s" #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "無法辨識套件『%s』(1)。" +msgstr "無法辨識套件檔 %s (1)" #: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "無法辨識套件『%s』(1)。" +msgstr "無法辨識套件檔 %s (2)" #: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號)。" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本)。" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" #: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (通用資源識別號分辨)。" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" #: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (特定版本)。" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" #: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "來源檔『%2$s』第 %1$lu 行有錯誤 (版本分辨)。" +msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" #: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" -msgstr "開啟『%s』中" +msgstr "正在開啟 %s" #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." -msgstr "來源檔『%2$s』第 %1$u 行太長。" +msgstr "來源列表 %2$s 中的第 %1$u 行太長。" #: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。" +msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行" +msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (商家名稱)。" +msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）" #: apt-pkg/packagemanager.cc:428 #, c-format @@ -2454,250 +2413,254 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"此安裝因衝突或特別依存關係，需暫時刪除『%s』這個重要套件。這種情形通常有問" -"題，但您確定的話請啟動『APT::Force-LoopBreak』選項。" +"此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但" +"若您執意進行，請設定 APT::Force-LoopBreak 選項。" #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "本軟體不支持『%s』型的索引檔。" +msgstr "不被支援的索引檔類型 '%s'" #: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "套件『%s』需要重新安裝，但找不到軟件檔案。" +msgstr "套件 %s 需要重新安裝，但找不到它的套件檔。" #: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." -msgstr "無法解決依存關係。可能原因是某些套件被押後。" +msgstr "" +"錯誤，pkgProblemResolver::Resolve 的建立中斷了，這可能肇因於保留 (hold) 套" +"件。" #: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "無法解決問題，因為某些損毀的套件被押後。" +msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" #: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -msgstr "有一些索引檔案不能下載,它們可能被忽略了,也可能轉而使用了舊的索引檔案。" +msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用舊的索引檔。" #: apt-pkg/acquire.cc:59 #, c-format msgid "Lists directory %spartial is missing." -msgstr "找不到『%spartial』清單目錄。" +msgstr "找不到清單目錄 %spartial。" #: apt-pkg/acquire.cc:63 #, c-format msgid "Archive directory %spartial is missing." -msgstr "找不到『%spartial』檔案目錄。" +msgstr "找不到套件檔目錄 %spartial。" #. only show the ETA if it makes sense #. two days #: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "正在下載第 %li 個文件(共 %li 個，尚需 %s)" +msgstr "正在取得檔案 %li/%li（還有 %s）" #: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "正在下載第%li個檔案(共有%li)" +msgstr "正在取得檔案 %li/%li" #: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "找不到安裝方式『%s』的驅動程式。" +msgstr "找不到安裝方式的驅動程式 %s。" #: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "安裝方式『%s』沒有正確啟動。" +msgstr "安裝方式 %s 沒有正確啟動" #: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "更換媒體：請把名為 '%s' 的光碟置入 '%s' 碟機,然後按 [Enter] 鍵。" +msgstr "請把標籤為 '%s' 的光碟放入 '%s' 裝置中，然後按下 [Enter] 鍵。" #: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "本軟體不支持『%s』包裝法。" +msgstr "不支援的套件包裝系統 '%s'" #: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" -msgstr "無法明白系統類別。" +msgstr "無法確認合適的套件包裝系統類型" #: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "無法讀取『%s』的目錄資料。" +msgstr "無法取得 %s 的狀態。" #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "『sources.list』檔中必須有一些『source』指令。" +msgstr "在 sources.list 中必須包含一些 'source' URI" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." -msgstr "無法讀取套件清單或狀況檔。" +msgstr "無法分析或開啟套件清單或狀況檔。" #: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "用『apt-get -f install』指令或許能修正這些問題。" +msgstr "您也許得執行 apt-get update 以修正這些問題" #: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "喜好檔有錯誤—缺少套件前置檔。" +msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" #: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "本軟體不支持『%s』型的版本釘子。" +msgstr "無法分析鎖定類型 %s" #: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "對於釘住的檔案無優先順序" +msgstr "銷定並沒有優先順序之分（或零）" #: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "套件暫存檔使用的是不相容的版本系統。" +msgstr "快取使用的是不相容的版本系統" #: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "處理『%s』時發生錯誤 (NewPackage)。" +msgstr "在處理 %s 時發生錯誤 (NewPackage)" #: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "處理『%s』時發生錯誤 (UsePackage1)。" +msgstr "在處理 %s 時發生錯誤 (UsePackage1)" #: apt-pkg/pkgcachegen.cc:164 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "處理『%s』時發生錯誤 (NewFileDesc1)。" +msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "處理『%s』時發生錯誤 (UsePackage2)。" +msgstr "在處理 %s 時發生錯誤 (UsePackage2)" #: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" +msgstr "在處理 %s 時發生錯誤 (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "處理『%s』時發生錯誤 (NewVersion1)。" +msgstr "在處理 %s 時發生錯誤 (NewVersion1)" #: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "處理『%s』時發生錯誤 (UsePackage3)。" +msgstr "在處理 %s 時發生錯誤 (UsePackage3)" #: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "處理『%s』時發生錯誤 (NewVersion2)。" +msgstr "在處理 %s 時發生錯誤 (NewVersion2)" #: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "處理『%s』時發生錯誤 (NewFileDesc2)。" +msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "套件數量超過本程式的能力。" +msgstr "哇呀，您已經超過這個 APT 所能處理的套件名稱數量了。" #: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "套件版本數量超過本程式的能力。" +msgstr "哇呀，您已經超過這個 APT 所能處理的版本數量了。" #: apt-pkg/pkgcachegen.cc:268 msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "哇，套件版本數量超過該 APT 的能力。" +msgstr "哇呀，您已經超過這個 APT 所能處理的說明數量了。" #: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "依存關係數量超過本程式的能力。" +msgstr "哇呀，您已經超過這個 APT 所能處理的相依關係數量了。" #: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "處理『%s』時發生錯誤 (FindPkg)。" +msgstr "在處理 %s 時發生錯誤 (FindPkg)" #: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "處理『%s』時發生錯誤 (CollectFileProvides)。" +msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "當計算相依性時找不到套件 %s %s " +msgstr "在計算檔案相依性時找不到套件 %s %s" #: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "無法讀取來源檔『%s』的目錄資料。" +msgstr "無法取得來源套件列表 %s 的狀態" #: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "收集檔案供應" +msgstr "正在收集檔案提供者" #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "無法寫入來源暫存檔。" +msgstr "在儲存來源快取時 IO 錯誤" #: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "檔名因『%s』更換失敗 (%s → %s)。" +msgstr "無法重新命名，%s (%s -> %s)。" #: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "MD5 檢查碼不符合。" +msgstr "MD5Sum 不符" #: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 msgid "Hash Sum mismatch" -msgstr "檢查碼不符合。" +msgstr "Hash Sum 不符" #: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "以下 key ID 沒有可用的公鑰：\n" +msgstr "無法取得以下的密鑰 ID 的公鑰：\n" #: apt-pkg/acquire-item.cc:1231 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" +msgstr "" +"找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" +"台）" #: apt-pkg/acquire-item.cc:1290 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。" +msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" #: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。" +msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" #: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "檔案大小不符合。" +msgstr "大小不符" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "廠商區段%s有錯誤。" +msgstr "提供者區塊 %s 沒有包含指紋碼" #: apt-pkg/cdrom.cc:529 #, c-format @@ -2706,20 +2669,20 @@ msgid "" "Mounting CD-ROM\n" msgstr "" "使用光碟機掛載點 %s\n" -"掛載光碟機中\n" +"正在掛載光碟機\n" #: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " -msgstr "標識中.." +msgstr "正在識別.." #: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s\n" -msgstr "保存標誌：%s \n" +msgstr "保存標籤：%s\n" #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 msgid "Unmounting CD-ROM...\n" -msgstr "卸載光碟機中...\n" +msgstr "正在卸載光碟機...\n" #: apt-pkg/cdrom.cc:590 #, c-format @@ -2728,36 +2691,36 @@ msgstr "使用光碟機掛載點 %s\n" #: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" -msgstr "卸載光碟機中\n" +msgstr "正在卸載光碟機\n" #: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" -msgstr "等待磁碟中...\n" +msgstr "正在等待碟片...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" -msgstr "掛載光碟機中... \n" +msgstr "正在掛載光碟機... \n" #: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "掃描碟片中的索引檔案..\n" +msgstr "正在掃描碟片中的索引檔..\n" #: apt-pkg/cdrom.cc:678 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" "zu signatures\n" -msgstr "找到 %zu 個套件索引，%zu 原始碼索引，%zu 翻譯索引和%zu 簽名\n" +msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n" #: apt-pkg/cdrom.cc:715 #, c-format msgid "Found label '%s'\n" -msgstr "發現標誌 %s \n" +msgstr "發現標籤 '%s'\n" #: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "這不是合法名稱，重試一下。\n" +msgstr "這並不是正確的名稱，請重試。\n" #: apt-pkg/cdrom.cc:760 #, c-format @@ -2770,11 +2733,11 @@ msgstr "" #: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." -msgstr "複製套件清單中" +msgstr "正在複製套件清單..." #: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "寫入新的來源列表中\n" +msgstr "正在寫入新的來源列表\n" #: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" @@ -2788,37 +2751,37 @@ msgstr "寫入 %i 筆紀錄。\n" #: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 #, c-format msgid "Wrote %i records with %i missing files.\n" -msgstr "寫入 %i 筆遺失 %i 個檔案的紀錄。\n" +msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了。\n" #: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "寫入 %i 筆 %i 個不匹配檔案的紀錄。\n" +msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案不符\n" #: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "寫入 %i 筆遺失 %i 個檔案和 %i 個不匹配檔案的紀錄。\n" +msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案不符\n" #: apt-pkg/deb/dpkgpm.cc:49 -#, fuzzy, c-format +#, c-format msgid "Installing %s" -msgstr "已安裝%s" +msgstr "正在安裝 %s" #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 #, c-format msgid "Configuring %s" -msgstr "設定%s中" +msgstr "正在設定 %s" #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 #, c-format msgid "Removing %s" -msgstr "移除%s中" +msgstr "正在移除 %s" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Running post-installation trigger %s" -msgstr "" +msgstr "正在執行安裝後套件後續處理程式 %s" #: apt-pkg/deb/dpkgpm.cc:521 #, c-format @@ -2828,105 +2791,79 @@ msgstr "找不到 '%s' 目錄" #: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "準備配置%s中" +msgstr "正在準備 %s" #: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" -msgstr "解開%s中" +msgstr "正在解開 %s" #: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "準備設定%s檔" +msgstr "正在準備設定 %s" #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format msgid "Processing triggers for %s" -msgstr "處理 %s 的啟動器" +msgstr "正在後續設定 %s" #: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "已安裝%s" +msgstr "已安裝 %s" #: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624 #: apt-pkg/deb/dpkgpm.cc:625 #, c-format msgid "Preparing for removal of %s" -msgstr "正在準備 %s 的刪除操作" +msgstr "正在準備移除 %s" #: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "已移除%s" +msgstr "已移除 %s" #: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "準備完整移除 %s" +msgstr "正在準備完整移除 %s" #: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "已完整移除%s" +msgstr "已完整移除 %s" #: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "無法寫入記錄檔，openpty()失敗(/dev/pts有掛載嗎？)\n" +msgstr "無法寫入記錄檔，openpty() 失敗（/dev/pts 未掛載？）\n" #: methods/rred.cc:219 msgid "Could not patch file" -msgstr "無法開啟『%s』檔案。" +msgstr "無法修補檔案" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "連線不預期的結束" +msgstr "連線突然終止" #~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." +#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-" +#~ "Limit. Current value: %lu. (man 5 apt.conf)" #~ msgstr "" -#~ "您僅要求對單一套件進行操作,這極有可能是因為\n" -#~ "該套件無法安裝,您最好提交一個針對這個套件\n" -#~ "的臭蟲報告。" +#~ "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%" +#~ "lu。(man 5 apt.conf)" -#, fuzzy -#~ msgid "Line %d too long (max %lu)" -#~ msgstr "第 %d 行太長（最長 %d）" - -#, fuzzy -#~ msgid "Line %d too long (max %d)" -#~ msgstr "第 %d 行太長（最長 %d）" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "處理『%s』時發生錯誤 (NewFileVer1)。" - -#, fuzzy -#~ msgid "Stored label: %s \n" -#~ msgstr "保存標誌：%s \n" - -#, fuzzy -#~ msgid "" -#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" -#~ "i signatures\n" -#~ msgstr "找到 %i 個套件索引，%i 源碼索引和 %i 簽名\n" +#~ msgid "Release file expired, ignoring %s (valid until %s)" +#~ msgstr "Release 檔已過期，略過 %s（有效期限 %s）" -#, fuzzy -#~ msgid "openpty failed\n" -#~ msgstr "Select 失敗" +#~ msgid "Conflicting distribution: %s (expected %s but got %s)" +#~ msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" -#~ msgid "File date has changed %s" -#~ msgstr "檔案資料已更改 %s" +#~ msgid "Unable to parse Release file %s" +#~ msgstr "無法辨別 Release 檔 %s" -#~ msgid "Reading file list" -#~ msgstr "讀取軟件表中" +#~ msgid "No sections in Release file %s" +#~ msgstr "在 Release 檔 %s 裡沒有區段" -#~ msgid "Could not execute " -#~ msgstr "無法取得『%s』鎖。" +#~ msgid "No Hash entry in Release file %s" +#~ msgstr "在 Release 檔 %s 裡沒有 Hash 項目" -- cgit v1.2.3-70-g09d2 From b846f385e12b197779a18d0d784eaeecd0ac084f Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 4 Jan 2009 14:09:01 +0100 Subject: Be clear about the debian-sid not being released as of now --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cfaa28b52..e63a95953 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.20) unstable; urgency=low +apt (0.7.20) UNRELEASED; urgency=low [ Eugene V. Lyubimkin ] * debian/changelog: -- cgit v1.2.3-70-g09d2 From aee048664c83ef2976ac1eb0eb8fbd7add3a1eb2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Jan 2009 09:00:11 +0100 Subject: prepare 0.7.20 upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e63a95953..c62d3598e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,7 +32,7 @@ apt (0.7.20) UNRELEASED; urgency=low - Vietnamese updated. Closes: #509422 - Traditional Chinese added. Closes: #510664 - -- Eugene V. Lyubimkin Sat, 06 Dec 2008 20:57:00 +0200 + -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 apt (0.7.20~exp2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 9c2ce6fb3172a76a84743792d9e45bfc7d6703b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Jan 2009 09:12:37 +0100 Subject: ready for 0.7.20 upload --- debian/changelog | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c62d3598e..7a737bcd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.20) UNRELEASED; urgency=low +apt (0.7.20) unstable; urgency=low [ Eugene V. Lyubimkin ] * debian/changelog: @@ -13,6 +13,12 @@ apt (0.7.20) UNRELEASED; urgency=low - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options. (Closes: #438559) - Mentioned '/* ... */' comments. (Closes: #507601) + * doc/examples/sources.list: + - Removed obsolete commented non-us deb-src entry, replaced it with + 'deb-src security.debian.org' one. (Closes: #411298) + * apt-pkg/contrib/mmap.cc: + - Added instruction how to work around MMap error in MMap error message. + (Closes: #385674, 436028) [ Michael Vogt ] * add option to "apt-get build-dep" to mark the needed @@ -31,24 +37,9 @@ apt (0.7.20) UNRELEASED; urgency=low - Catalan updated. Closes: #509375 - Vietnamese updated. Closes: #509422 - Traditional Chinese added. Closes: #510664 - - -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 - -apt (0.7.20~exp2) unstable; urgency=low - - [ Eugene V. Lyubimkin ] - * doc/examples/sources.list: - - Removed obsolete commented non-us deb-src entry, replaced it with - 'deb-src security.debian.org' one. (Closes: #411298) - * apt-pkg/contrib/mmap.cc: - - Added instruction how to work around MMap error in MMap error message. - (Closes: #385674, 436028) - - [ Christian Perrier ] - * Translations: - French corrected (remove awful use of first person) - -- Michael Vogt Tue, 02 Dec 2008 20:30:14 +0100 + -- Michael Vogt Mon, 05 Jan 2009 08:59:20 +0100 apt (0.7.19) unstable; urgency=low @@ -66,7 +57,6 @@ apt (0.7.19) unstable; urgency=low is a request to install only one package and it is not installable. (Closes: #419521) - [ Michael Vogt ] - fix SIGHUP handling (closes: #463030) -- cgit v1.2.3-70-g09d2 From c56db9fa27c227618e482f14a851d4443501c07b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 5 Jan 2009 11:10:41 +0100 Subject: * COPYING: - Actualized. Removed obsolete Qt section, added GPLv2 clause. (Closes: #440049, #509337) --- COPYING | 151 ++++++------------------------------------------------- debian/changelog | 3 ++ 2 files changed, 19 insertions(+), 135 deletions(-) (limited to 'debian') diff --git a/COPYING b/COPYING index 3baf9ac5a..bba1b752b 100644 --- a/COPYING +++ b/COPYING @@ -1,142 +1,23 @@ Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. +Apt is currently developed by APT Development Team . -Apt is licensed under the terms of the GNU General Public License (GPL), -version 2.0 or later, as published by the Free Software Foundation. See -the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or - for the terms of the latest version -of the GNU General Public License. - -In addition, prior to November 15th, 2000, apt may be distributed under -terms identical to the above with the following addition: - -Works using apt may link against the GUI library "libqt", copyright by -Troll Tech AS, Norway, provided that: - -1. The version of "libqt" is licensed under the terms of the "Qt Free Edition - License" published by Troll Tech AS. The license terms identified as - the Qt Free Edition License below are the only such terms under which - distribution of works derived from both apt and "libqt" are permitted; - -and - -2. The source code of the version of "libqt" used is - - a) Distributed with the binary version; - - or - - b) Downloadable by anyone, without fee, using a publicly-announced - URL on the Internet, for a duration of at least three years - starting with distribution of the binary version. - -On and after November 15th, 2000, the above additional terms lose all -force, and apt will be licensed only under the terms of the GNU General -Public License, version 2.0 or later. - - _______________________________________________________________ - -The following text, up to the text of the Qt Free Edition License, is -informational and not part of the license terms on apt. - -Modifications to apt in either source or compiled form must be licensed -under the terms of the GNU General Public License, version 2.0 (or later), -but need not include the above clause permitting usage of the "libqt" -library under the Qt Free Edition License. Note that removal of this -clause will result in software which is not licensed for binary -redistribution linked against software governed by the Qt Free Edition -License. In the event that a version of "libqt" is released that is -licensed under terms that do not conflict with the GPL, the additional -clause above is not required to grant permission for distribution of works -that are derived from both apt and "libqt". - -No part of apt is licensed under the Qt Free Edition License. The terms -below are provided to help identify the circumstances under which the -"libqt" library may be used with apt (or a work derived from both). The -terms below are copied from the LICENSE file of the qt-1.44 distribution, -as of November 10th, 1999. - - _______________________________________________________________ - - QT FREE EDITION LICENSE +License: GPLv2+ -Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This is the license for Qt Free Edition version 1.44; it covers private use, -use of third-party application programs based on Qt, and development of -free software for the free software community. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - COPYRIGHT AND RESTRICTIONS - -The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited -to use with the X Window System. - -You may copy this version of the Qt Free Edition provided that the entire -archive is distributed unchanged and as a whole, including this notice. - -You may use this version of the Qt Free Edition to compile, link and run -application programs legally developed by third parties. - -You may use the Qt Free Edition to create application programs -provided that: - - You accept this license. - Your software does not require modifications to Qt Free Edition. - You satisfy ONE of the following three requirements - EITHER - Users of your software can freely obtain source code for the - software, freely modify the source code (possibly with - restrictions on copyright notices, attributions and legal - responsibility), and freely redistribute original or modified - versions of the software. - OR - Your software is distributed under the GNU GENERAL - PUBLIC LICENSE, version 2 or later, as defined by the - Free Software Foundation. - OR - Your software is distributed under the GNU LIBRARY - GENERAL PUBLIC LICENSE, version 2 or later, as - defined by the Free Software Foundation. - -If you are paid to develop something with Qt Free Edition or it is a part of -your job the following conditions also apply: - - Your software must not require libraries, programs, data or - documentation that are not available outside your organization in - order to compile or use. - If and when your organization starts using the software, you must - notify Troll Tech AS of the following: - Your organization's name and purpose. - The software's name and purpose. - The software's license. - That your organization considers the software to be free - software. - -You may also use the Qt Free Edition to create reusable components -(such as libraries) provided that you accept the terms above, and in -addition that: - - Your components' license includes the following text: - - [Your package] requires the Qt library, which is - copyright Troll Tech AS. Freely distributable - programs may generally use Qt Free Edition free of - charge, see [README.QT] for details. - - README.QT is distributed along with your components. - Qt Free Edition is not distributed as an integral part of your - components. - - LIMITATIONS OF LIABILITY - -Troll Tech AS makes no obligation under this license to support or -upgrade Qt Free Edition, or assist in the use of Qt Free Edition. - -In no event shall Troll Tech AS be liable for any lost revenue or profits or -other direct, indirect, special, incidental or consequential damages, even -if Troll Tech has been advised of the possibility of such damages. +See /usr/share/common-licenses/GPL-2, or + for the terms of the latest version +of the GNU General Public License. -QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, -INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. - _______________________________________________________________ diff --git a/debian/changelog b/debian/changelog index 7a737bcd6..622152f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ apt (0.7.20) unstable; urgency=low * apt-pkg/contrib/mmap.cc: - Added instruction how to work around MMap error in MMap error message. (Closes: #385674, 436028) + * COPYING: + - Actualized. Removed obsolete Qt section, added GPLv2 clause. + (Closes: #440049, #509337) [ Michael Vogt ] * add option to "apt-get build-dep" to mark the needed -- cgit v1.2.3-70-g09d2 From 6b75a560808457d8cd0fac9ce4917eda1d7ed53d Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 11 Jan 2009 19:26:59 +0100 Subject: Fix spelling error in French translation --- debian/changelog | 7 +++++++ po/ChangeLog | 4 ++++ po/fr.po | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 622152f29..2520be85b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.21) UNRELEASED; urgency=low + + * Translations: + - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. + + -- Christian Perrier Sun, 11 Jan 2009 19:26:00 +0100 + apt (0.7.20) unstable; urgency=low [ Eugene V. Lyubimkin ] diff --git a/po/ChangeLog b/po/ChangeLog index 9a5a0016b..3e9057d2b 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2008-12-11 Christian Perrier + + * fr.po: fix spelling error to "défectueux" + 2009-01-04 Tetralet * zh_TW.po: Added as 538t1u. diff --git a/po/fr.po b/po/fr.po index 91099636a..a6fe7640e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2541,7 +2541,7 @@ msgstr "" #: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." msgstr "" -"Impossible de corriger les problèmes, des paquets défecteux sont en mode " +"Impossible de corriger les problèmes, des paquets défectueux sont en mode " "« garder en l'état »." #: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 -- cgit v1.2.3-70-g09d2 From 915bdcf748bc54410fb3e0b15c812cb7132c64e3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 19 Jan 2009 12:54:05 +0100 Subject: * apt-pkg/pkgcachegen.cc: - fix apt-cache search for localized description (closes: #512110) --- apt-pkg/pkgcachegen.cc | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index f71547f39..397c19829 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -143,7 +143,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // don't add a new description if we have one for the given // md5 && language - for ( ; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++) + for ( ; Desc.end() == false; Desc++) if (MD5SumValue(Desc.md5()) == CurMd5 && Desc.LanguageCode() == List.DescriptionLanguage()) duplicate=true; diff --git a/debian/changelog b/debian/changelog index 2520be85b..ab93f2878 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ apt (0.7.21) UNRELEASED; urgency=low + [ Michael Vogt ] + * apt-pkg/pkgcachegen.cc: + - fix apt-cache search for localized description + (closes: #512110) + + [ Christian Perrier ] * Translations: - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. -- cgit v1.2.3-70-g09d2 From 52697148987a4d557f936c6fcf4bc72e348c3c56 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 27 Jan 2009 20:05:14 +0100 Subject: Updated Bulgarian translations --- debian/changelog | 1 + po/ChangeLog | 4 ++++ po/bg.po | 58 +++++--------------------------------------------------- 3 files changed, 10 insertions(+), 53 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ab93f2878..9d313c7c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.7.21) UNRELEASED; urgency=low [ Christian Perrier ] * Translations: - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. + - bg.po. Closes: #513211 -- Christian Perrier Sun, 11 Jan 2009 19:26:00 +0100 diff --git a/po/ChangeLog b/po/ChangeLog index 3e9057d2b..326009d97 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-01-27 Damyan Ivanov + + * bg.po: updated to 539t. + 2008-12-11 Christian Perrier * fr.po: fix spelling error to "défectueux" diff --git a/po/bg.po b/po/bg.po index d427249c0..60c988119 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,18 +1,16 @@ -# translation of apt_po_bg.po to Bulgarian +# translation of apt-all.pot to Bulgarian # Bulgarian translation of apt. # Copyright (C) 2006, 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # # Yavor Doganov , 2006. -# Damyan Ivanov , 2008. -# Damyan Ivanov , 2008. -# Damyan Ivanov , 2008. +# Damyan Ivanov , 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: apt_po_bg\n" +"Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-12 21:57+0200\n" +"PO-Revision-Date: 2009-01-27 12:41+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -169,43 +167,6 @@ msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" #: cmdline/apt-cache.cc:1721 -#, fuzzy -#| msgid "" -#| "Usage: apt-cache [options] command\n" -#| " apt-cache [options] add file1 [file2 ...]\n" -#| " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" -#| " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" -#| "\n" -#| "apt-cache is a low-level tool used to manipulate APT's binary\n" -#| "cache files, and query information from them\n" -#| "\n" -#| "Commands:\n" -#| " add - Add a package file to the source cache\n" -#| " gencaches - Build both the package and source cache\n" -#| " showpkg - Show some general information for a single package\n" -#| " showsrc - Show source records\n" -#| " stats - Show some basic statistics\n" -#| " dump - Show the entire file in a terse form\n" -#| " dumpavail - Print an available file to stdout\n" -#| " unmet - Show unmet dependencies\n" -#| " search - Search the package list for a regex pattern\n" -#| " show - Show a readable record for the package\n" -#| " depends - Show raw dependency information for a package\n" -#| " rdepends - Show reverse dependency information for a package\n" -#| " pkgnames - List the names of all packages\n" -#| " dotty - Generate package graphs for GraphVis\n" -#| " xvcg - Generate package graphs for xvcg\n" -#| " policy - Show policy settings\n" -#| "\n" -#| "Options:\n" -#| " -h This help text.\n" -#| " -p=? The package cache.\n" -#| " -s=? The source cache.\n" -#| " -q Disable progress indicator.\n" -#| " -i Show only important deps for the unmet command.\n" -#| " -c=? Read this configuration file\n" -#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#| "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -264,7 +225,7 @@ msgstr "" " show - Показва запис за пакета\n" " depends - Показва необработена информация за зависимости на пакета\n" " rdepends - Показва информация за обратните зависимости на пакета\n" -" pkgnames - Списък с имената на всички пакети\n" +" pkgnames - Списък с имената на всички пакети, за които има информация\n" " dotty - Генериране на графики на пакети за GraphVis\n" " xvcg - Генериране на графики на пакети за xvcg\n" " policy - Показване на настройките на политиката\n" @@ -2969,12 +2930,3 @@ msgstr "Неуспех при закърпване на файла" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Тъй като сте указали единична операция, твърде е възможно пакета просто\n" -#~ "да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" -#~ "доклад за грешка за този пакет." -- cgit v1.2.3-70-g09d2 From c3bf1d5878f5d0454a6883e3bf8541e1d10540ae Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 29 Jan 2009 22:19:26 +0100 Subject: Traditional Chinese translation update --- debian/changelog | 1 + po/zh_TW.po | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9d313c7c9..ddb142807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.21) UNRELEASED; urgency=low * Translations: - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 -- Christian Perrier Sun, 11 Jan 2009 19:26:00 +0100 diff --git a/po/zh_TW.po b/po/zh_TW.po index 296e58a24..ce7ebc21d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-01-04 12:41+0800\n" +"PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet \n" "Language-Team: Debian-user in Chinese [Big5] \n" @@ -1458,7 +1458,7 @@ msgstr "找不到雜湊元件！" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "在配置轉移資訊時失敗" +msgstr "在配置抽換資訊時失敗" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1467,12 +1467,12 @@ msgstr "在 AddDiversion 發生了內部錯誤" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "試圖改寫轉移資訊，%s -> %s 和 %s/%s" +msgstr "試圖改寫抽換資訊，%s -> %s 和 %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "重複加入轉移資訊 %s -> %s" +msgstr "重複加入抽換資訊 %s -> %s" #: apt-inst/filelist.cc:549 #, c-format @@ -1502,16 +1502,16 @@ msgstr "解開 %s 超過一次" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "路徑 %s 已被轉移" +msgstr "路徑 %s 已被抽換" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "此套件試圖寫至轉移後的目標 %s/%s" +msgstr "此套件試圖寫至抽換後的目標 %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "要進行轉移的路徑過長" +msgstr "要進行抽換的路徑過長" #: apt-inst/extract.cc:240 #, c-format @@ -1610,21 +1610,21 @@ msgstr "內部錯誤，無法取得節點" #: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "讀取轉移檔 %sdiversions 失敗" +msgstr "讀取抽換檔 %sdiversions 失敗" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "轉移檔已損壞" +msgstr "抽換檔已損壞" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "在轉移檔中的這一行有誤：%s" +msgstr "在抽換檔中的這一行有誤：%s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "內部錯誤：在新增轉移資料時發生錯誤" +msgstr "內部錯誤：在新增抽換資料時發生錯誤" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -2218,7 +2218,7 @@ msgstr "子程序 %s 傳回錯誤碼 (%u)" #: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "子程序 %s 不預期的結束" +msgstr "子程序 %s 不預期得結束" #: apt-pkg/contrib/fileutl.cc:503 #, c-format @@ -2443,7 +2443,7 @@ msgstr "無法修正問題，您保留 (hold) 了損毀的套件。" msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用舊的索引檔。" +msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。" #: apt-pkg/acquire.cc:59 #, c-format @@ -2716,7 +2716,7 @@ msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯 #: apt-pkg/cdrom.cc:715 #, c-format msgid "Found label '%s'\n" -msgstr "發現標籤 '%s'\n" +msgstr "找到標籤 '%s'\n" #: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" @@ -2806,7 +2806,7 @@ msgstr "正在準備設定 %s" #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format msgid "Processing triggers for %s" -msgstr "正在後續設定 %s" +msgstr "正在進行 %s 的觸發程式" #: apt-pkg/deb/dpkgpm.cc:617 #, c-format -- cgit v1.2.3-70-g09d2 From ca1d73b7dd62f379798f0873a1e796ec25aea019 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 1 Feb 2009 19:48:02 +0100 Subject: Norwegian Bokmal translation update --- debian/changelog | 1 + po/ChangeLog | 4 ++++ po/nb.po | 11 +++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ddb142807..9722663a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.7.21) UNRELEASED; urgency=low - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. - bg.po. Closes: #513211 - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 -- Christian Perrier Sun, 11 Jan 2009 19:26:00 +0100 diff --git a/po/ChangeLog b/po/ChangeLog index 326009d97..591f10b0a 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-02-01 Hans Fredrik Nordhaug + + * nb.po: updated to 539t. + 2009-01-27 Damyan Ivanov * bg.po: updated to 539t. diff --git a/po/nb.po b/po/nb.po index 4f4d49995..1f218850f 100644 --- a/po/nb.po +++ b/po/nb.po @@ -7,14 +7,14 @@ # Axel Bojer , 2003-2004. # Klaus Ade Johnstad , 2004. # Bjorn Steensrud , 2004. -# Hans Fredrik Nordhaug , 2003, 2005-2008. +# Hans Fredrik Nordhaug , 2003, 2005-2009. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-17 02:07+0100\n" +"PO-Revision-Date: 2009-02-01 18:26+0100\n" "Last-Translator: Hans Fredrik Nordhaug \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" @@ -2895,6 +2895,13 @@ msgstr "Kunne ikke msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#~ msgid "" +#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-" +#~ "Limit. Current value: %lu. (man 5 apt.conf)" +#~ msgstr "" +#~ "Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. " +#~ "Nvrende verdi: %lu. (man 5 apt.conf)" + #~ msgid "" #~ "Since you only requested a single operation it is extremely likely that\n" #~ "the package is simply not installable and a bug report against\n" -- cgit v1.2.3-70-g09d2 From af264e21323a32cc0bae10d34ec0d57226503370 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 8 Feb 2009 11:49:08 +0100 Subject: fix changlog --- configure.in | 2 +- debian/changelog | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index f90a32c3b..fa4ddfc6a 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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.20~exp3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 9722663a0..21a9ba87c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,14 @@ -apt (0.7.21) UNRELEASED; urgency=low +apt (0.7.20.3) UNRELEASED; urgency=low + + [ Christian Perrier ] + * Translations: + - bg.po. Closes: #513211 + - zh_TW.po. Closes: #513311 + - nb.po. Closes: #513843 + + -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 + +apt (0.7.20.1) unstable; urgency=low [ Michael Vogt ] * apt-pkg/pkgcachegen.cc: @@ -8,11 +18,8 @@ apt (0.7.21) UNRELEASED; urgency=low [ Christian Perrier ] * Translations: - fr.po: fix spelling error to "défectueux". Thanks to Thomas Péteul. - - bg.po. Closes: #513211 - - zh_TW.po. Closes: #513311 - - nb.po. Closes: #513843 - -- Christian Perrier Sun, 11 Jan 2009 19:26:00 +0100 + -- Michael Vogt Tue, 20 Jan 2009 09:35:05 +0100 apt (0.7.20) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 651001f7501431b75e967ba060160129d5a7ed74 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 8 Feb 2009 11:52:34 +0100 Subject: merge the 0.7.20.2 upload --- .cvsignore | 4 ---- configure.in | 2 +- debian/.cvsignore | 13 ------------- debian/changelog | 9 +++++++++ doc/.cvsignore | 14 -------------- doc/apt-get.8.xml | 2 +- doc/apt.ent | 7 +++++++ doc/es/.cvsignore | 14 -------------- doc/fr/.cvsignore | 13 ------------- doc/pt_BR/.cvsignore | 3 --- 10 files changed, 18 insertions(+), 63 deletions(-) delete mode 100644 .cvsignore delete mode 100644 debian/.cvsignore delete mode 100644 doc/.cvsignore delete mode 100644 doc/es/.cvsignore delete mode 100644 doc/fr/.cvsignore delete mode 100644 doc/pt_BR/.cvsignore (limited to 'debian') diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f9bbb8298..000000000 --- a/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -autom4te.cache -aclocal.m4 -configure -build diff --git a/configure.in b/configure.in index fa4ddfc6a..b6e5d6bbd 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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.20.1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.20.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index d9f983686..000000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -copyright -apt -apt-doc -apt-utils -apt-utils.substvars -apt.substvars -files -libapt-pkg-dev -libapt-pkg-doc -shlibs.local -shlibs.local.apt -shlibs.local.apt-utils -*.debhelper diff --git a/debian/changelog b/debian/changelog index 21a9ba87c..dfc18316b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,15 @@ apt (0.7.20.3) UNRELEASED; urgency=low -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 +apt (0.7.20.2) unstable; urgency=medium + + [ Eugene V. Lyubimkin ] + * Urgency set to medium due to RC bug fix. + * doc/apt.ent, apt-get.8.xml: + - Fix invalid XML entities. (Closes: #514402) + + -- Eugene V. Lyubimkin Sat, 07 Feb 2009 16:48:21 +0200 + apt (0.7.20.1) unstable; urgency=low [ Michael Vogt ] diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index 94d80ad54..000000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -apt-cache.8 -apt-get.8 -apt-cdrom.8 -apt.conf.5 -sources.list.5 -apt-config.8 -apt-sortpkgs.1 -apt-ftparchive.1 -manpage.links -manpage.refs -manpage.log -apt_preferences.5 -apt-extracttemplates.1 -vendors.list.5 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ace7f9e1b..c1b3470ef 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -581,8 +581,8 @@ CURRENT AUTHORS &apt-author.team; - &apt-qapage; + &apt-qapage; &manbugs; diff --git a/doc/apt.ent b/doc/apt.ent index 6594ba1b3..4cfc00069 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -179,6 +179,13 @@ "> + + Mike + O'Connor + +"> + APT team diff --git a/doc/es/.cvsignore b/doc/es/.cvsignore deleted file mode 100644 index ce363466a..000000000 --- a/doc/es/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -apt-cache.es.8 -apt-get.es.8 -apt-cdrom.es.8 -apt.conf.es.5 -sources.list.es.5 -apt-config.es.8 -apt-sortpkgs.es.1 -apt-ftparchive.es.1 -manpage.links -manpage.refs -manpage.log -apt_preferences.es.5 -apt-extracttemplates.es.1 -vendors.list.es.5 diff --git a/doc/fr/.cvsignore b/doc/fr/.cvsignore deleted file mode 100644 index cfa89623e..000000000 --- a/doc/fr/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -apt-cdrom.fr.8 -apt-config.fr.8 -apt-extracttemplates.fr.1 -apt-ftparchive.fr.1 -apt-sortpkgs.fr.1 -apt.conf.fr.5 -apt_preferences.fr.5 -manpage.links -manpage.refs -sources.list.fr.5 -apt-cache.fr.8 -apt-get.fr.8 -vendors.list.fr.5 diff --git a/doc/pt_BR/.cvsignore b/doc/pt_BR/.cvsignore deleted file mode 100644 index 8d11bcc88..000000000 --- a/doc/pt_BR/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -apt_preferences.pt_BR.5 -manpage.links -manpage.refs -- cgit v1.2.3-70-g09d2 From 9c3dd488d7e03f9849c4ce1a35d3592156097562 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 24 Feb 2009 08:35:02 +0100 Subject: French translation update --- debian/changelog | 1 + po/ChangeLog | 1 + po/fr.po | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dfc18316b..867b66f08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - bg.po. Closes: #513211 - zh_TW.po. Closes: #513311 - nb.po. Closes: #513843 + - fr.po -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 diff --git a/po/ChangeLog b/po/ChangeLog index 72368c620..b16e37dbf 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -2,6 +2,7 @@ * Update all PO files and apt-all.pot. 539 strings. Formerly complete PO files are now 538t1u + * fr.po: updated to 539t. 2009-02-01 Hans Fredrik Nordhaug diff --git a/po/fr.po b/po/fr.po index 1b6cca941..076157ae4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ # French messages # # Pierre Machard , 2002,2003,2004. -# Christian Perrier , 2004-2005, 2006, 2007, 2008. +# Christian Perrier , 2004-2005, 2006, 2007, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-12 22:42+0100\n" +"PO-Revision-Date: 2009-02-24 08:32+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -2133,6 +2133,9 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"La zone dynamique d'allocation mémoire (« Dynamic MMap ») n'a plus de place. " +"Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur " +"actuelle est de %lu (voir « man 5 apt.conf »)." #: apt-pkg/contrib/strutl.cc:1014 #, c-format -- cgit v1.2.3-70-g09d2 From 1ba20bc48f7e4e109682f5be7b3d6343af0eeb93 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 4 Mar 2009 21:37:32 +0100 Subject: Swedish translation update --- debian/changelog | 1 + po/ChangeLog | 4 ++++ po/sv.po | 30 ++++++++++++++++-------------- 3 files changed, 21 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 867b66f08..7dcdd81b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - zh_TW.po. Closes: #513311 - nb.po. Closes: #513843 - fr.po + - sv.po. Closes: #518070 -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 diff --git a/po/ChangeLog b/po/ChangeLog index b16e37dbf..2fd30a839 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-03-04 Daniel Nylander + + * sv.po: Updated to 539t + 2009-02-23 Christian Perrier * Update all PO files and apt-all.pot. 539 strings. diff --git a/po/sv.po b/po/sv.po index 4c015b9b6..cc4e2a51e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,14 +1,14 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages # Peter Karlsson , 2002-2008. -# Daniel Nylander , 2005-2008. +# Daniel Nylander , 2005-2009. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-13 00:28+0100\n" +"PO-Revision-Date: 2009-03-03 23:15+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgstr "Listan över filtillägg för Sources är för lång" #: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Fel vid skrivning av huvud till innehållsfil" +msgstr "Fel vid skrivning av rubrik till innehållsfil" #: ftparchive/apt-ftparchive.cc:398 #, c-format @@ -1461,7 +1461,7 @@ msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Okänd TAR-huvudtyp %u, del %s" +msgstr "Okänd TAR-rubriktyp %u, del %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" @@ -1469,11 +1469,11 @@ msgstr "Ogiltig arkivsignatur" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Fel vid läsning av huvud för arkivdel" +msgstr "Fel vid läsning av rubrik för arkivdel" #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Ogiltigt arkivdelshuvud" +msgstr "Ogiltigt arkivdelsrubrik" #: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" @@ -1481,7 +1481,7 @@ msgstr "Arkivet är för kort" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Misslyckades med att läsa arkivhuvuden" +msgstr "Misslyckades med att läsa arkivrubriker" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" @@ -1669,7 +1669,7 @@ msgstr "Paketcachen måste först initieras" #: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Misslyckades med att hitta Package:-huvud, position %lu" +msgstr "Misslyckades med att hitta Package:-rubrik, position %lu" #: apt-inst/deb/dpkgdb.cc:461 #, c-format @@ -2015,16 +2015,16 @@ msgstr "Läsfel från %s-processen" #: methods/http.cc:377 msgid "Waiting for headers" -msgstr "Väntar på huvuden" +msgstr "Väntar på rubriker" #: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" -msgstr "Fick en ensam huvudrad på %u tecken" +msgstr "Fick en ensam rubrikrad på %u tecken" #: methods/http.cc:531 msgid "Bad header line" -msgstr "Felaktig huvudrad" +msgstr "Felaktig rubrikrad" #: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" @@ -2032,11 +2032,11 @@ msgstr "Http-servern sände ett ogiltigt svarshuvud" #: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Http-servern sände ett ogiltigt Content-Length-huvud" +msgstr "Http-servern sände ett ogiltigt Content-Length-rubrik" #: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Http-servern sände ett ogiltigt Content-Range-huvud" +msgstr "Http-servern sände ett ogiltigt Content-Range-rubrik" #: methods/http.cc:603 msgid "This HTTP server has broken range support" @@ -2105,6 +2105,8 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. " +"Aktuellt värde: %lu. (man 5 apt.conf)" #: apt-pkg/contrib/strutl.cc:1014 #, c-format @@ -2575,7 +2577,7 @@ msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\ # "Package" är en sträng i konfigurationsfilen #: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-huvud saknas" +msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas" #: apt-pkg/policy.cc:289 #, c-format -- cgit v1.2.3-70-g09d2 From 8bd7c0c1f2407a51a67749b025952611e2ad563c Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 19 Mar 2009 19:49:14 +0100 Subject: Slovak translation update --- debian/changelog | 1 + po/ChangeLog | 4 ++++ po/sk.po | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7dcdd81b6..c0baa263e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - nb.po. Closes: #513843 - fr.po - sv.po. Closes: #518070 + - sk.po. Closes: #520403 -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 diff --git a/po/ChangeLog b/po/ChangeLog index 2fd30a839..2ad5351e4 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-03-19 Ivan Masár + + * sk.po: Updated to 539t + 2009-03-04 Daniel Nylander * sv.po: Updated to 539t diff --git a/po/sk.po b/po/sk.po index 0258681bf..79c7b4222 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,14 +4,14 @@ # thanks to Miroslav Kure # # Peter Mann , 2006. -# Ivan Masár , 2008. +# Ivan Masár , 2008, 2009. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-12 23:06+0100\n" +"PO-Revision-Date: 2009-03-19 12:06+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -2079,7 +2079,7 @@ msgstr "Nedá sa urobiť mmap %lu bajtov" msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" -msgstr "" +msgstr "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)" #: apt-pkg/contrib/strutl.cc:1014 #, c-format -- cgit v1.2.3-70-g09d2 From 6187ad8b5ceaf88cd48cedf3021bd8a61c6eafd0 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 19 Mar 2009 19:52:21 +0100 Subject: French translation update was reported in the BTS --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c0baa263e..0d80ba4c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - bg.po. Closes: #513211 - zh_TW.po. Closes: #513311 - nb.po. Closes: #513843 - - fr.po + - fr.po. Closes: #520430 - sv.po. Closes: #518070 - sk.po. Closes: #520403 -- cgit v1.2.3-70-g09d2 From d784cd85944c31a58b92e3235101b52d73712612 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 2 Apr 2009 07:31:41 +0200 Subject: Italian translation --- debian/changelog | 1 + po/it.po | 1111 ++++++++++++++++++++++++++---------------------------- 2 files changed, 534 insertions(+), 578 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0d80ba4c8..b63fcaeab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - fr.po. Closes: #520430 - sv.po. Closes: #518070 - sk.po. Closes: #520403 + - it.po. Closes: #522222 -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 diff --git a/po/it.po b/po/it.po index 822d81b30..541c04fd9 100644 --- a/po/it.po +++ b/po/it.po @@ -1,16 +1,19 @@ -# Advanced Package Transfer - APT message translation catalog +# Italian translation of apt +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc. +# This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon , 2002. +# Milo Casagrande , 2009 # msgid "" msgstr "" -"Project-Id-Version: apt 0.5.5\n" +"Project-Id-Version: apt 0.7.20\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2008-11-14 12:19+0100\n" -"Last-Translator: Samuele Giovanni Tonon \n" -"Language-Team: Italian \n" +"PO-Revision-Date: 2009-04-01 19:54+0200\n" +"Last-Translator: Milo Casagrande \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:143 @@ -83,7 +86,7 @@ msgstr "Totale spazio di dipendenza di versione: " #: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Totale spazio \"slack\": " +msgstr "Totale spazio inutilizzato: " #: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " @@ -92,11 +95,11 @@ msgstr "Totale spazio occupato: " #: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format msgid "Package file %s is out of sync." -msgstr "Il file dei pacchetti %s non sincronizzato." +msgstr "Il file dei pacchetti %s non è sincronizzato." #: cmdline/apt-cache.cc:1293 msgid "You must give exactly one pattern" -msgstr "Bisogna specificare unicamente un pattern" +msgstr "È necessario specificare un solo modello" #: cmdline/apt-cache.cc:1447 msgid "No packages found" @@ -109,7 +112,7 @@ msgstr "File dei pacchetti:" #: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"La cache non sincronizzata, impossibile referenziare un file di pacchetti" +"La cache non è sincronizzata, impossibile referenziare un file di pacchetti" #: cmdline/apt-cache.cc:1532 #, c-format @@ -119,7 +122,7 @@ msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1544 msgid "Pinned packages:" -msgstr "Pacchetti con pin:" +msgstr "Pacchetti con gancio:" #: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" @@ -141,7 +144,7 @@ msgstr " Candidato: " #: cmdline/apt-cache.cc:1594 msgid " Package pin: " -msgstr " Pin del pacchetto: " +msgstr " Gancio del pacchetto: " #. Show the priority tables #: cmdline/apt-cache.cc:1603 @@ -198,24 +201,25 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Utilizzo: apt-cache [opzioni] comando\n" -" apt-cache [opzioni] add file1 [file2 ...]\n" -" apt-cache [opzioni] showpkg pkg1 [pkg2 ...]\n" -" apt-cache [opzioni] showsrc pkg1 [pkg2 ...]\n" +"Uso: apt-cache [OPZIONI] COMANDO\n" +" apt-cache [OPZIONI] add FILE1 [FILE2 ...]\n" +" apt-cache [OPZIONI] showpkg PKG1 [PKG2 ...]\n" +" apt-cache [OPZIONI] showsrc PKG1 [PKG2 ...]\n" "\n" -"apt-cache un tool di basso livello usato per manipolare \n" -"i file di cache dei binari di APT, e cercare informazioni in questi\n" +"apt-cache è uno strumento di basso livello usato per manipolare \n" +"i file di cache dei binari di APT e cercare informazioni in questi\n" "\n" "Comandi:\n" -" add - Aggiunge un file di pacchetti alla cache sorgente \n" -" gencaches - Costruisce sia la cache dei pacchetti che dei sorgenti\n" +" add - Aggiunge un file di pacchetti alla cache sorgente\n" +" gencaches - Costruisce sia la cache dei pacchetti sia quella dei " +"sorgenti\n" " showpkg - Mostra informazioni generali per un singolo pacchetto\n" " showsrc - Mostra i campi dei sorgenti\n" " stats - Mostra alcune statistiche di base\n" " dump - Mostra il file in forma compatta\n" -" dumpavail - Stampa un file \"available\" in stdout\n" +" dumpavail - Stampa un file \"available\" sullo stdout\n" " unmet - Mostra le dipendenze non soddisfatte\n" -" search - Cerca nella lista dei pacchetti la regex specificata\n" +" search - Cerca nell'elenco dei pacchetti un'espressione regolare\n" " show - Mostra un campo leggibile per il pacchetto specificato\n" " depends - Mostra informazioni di dipendenza per un pacchetto\n" " rdepends - Mostra informazioni di dipendenza all'incontrario per un " @@ -226,23 +230,23 @@ msgstr "" " policy - Mostra le preferenze adottate\n" "\n" "Opzioni:\n" -" -h Questo help.\n" -" -p=? la cache pacchetti.\n" -" -s=? la cache sorgenti.\n" -" -q Disabilita l'indicatore di progresso\n" +" -h Mostra questo aiuto\n" +" -p=? La cache dei pacchetti\n" +" -s=? La cache dei sorgenti\n" +" -q Disabilita l'indicatore di avanzamento\n" " -i Mostra solo dipendenze importanti per il comando unmet\n" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" -"Consultare le pagine del manuale apt-cache(8) e apt.conf(5) per maggiori " -"informazioni\n" +"Per maggiori informazioni, consultare le pagine di manuale apt-cache(8) e " +"apt.conf(5).\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'" +msgstr "Dare un nome a questo disco, tipo \"Debian 5.0 Disco 1\"" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Inserire un disco nel drive e premere invio" +msgstr "Inserire un disco nell'unità e premere Invio" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." @@ -267,24 +271,23 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Utilizzo: apt-config [opzioni] comando\n" +"Uso: apt-config [OPZIONI] COMANDO\n" "\n" -"apt-config un semplice programma per leggere il file di configurazione di " -"APT\n" +"apt-config è uno strumento per leggere il file di configurazione di APT\n" "\n" "Comandi:\n" -" shell - Modalit shell\n" +" shell - Modalità shell\n" " dump - Mostra la configurazione\n" "\n" "Opzioni\n" -" -h Questo help.\n" -" -c=? Legge questo file di configurazione\n" +" -h Mostra questo aiuto\n" +" -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format msgid "%s not a valid DEB package." -msgstr "%s non un pacchetto DEB valido." +msgstr "%s non è un pacchetto DEB valido." #: cmdline/apt-extracttemplates.cc:232 msgid "" @@ -299,13 +302,13 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Utilizzo: apt-extracttemplates file1 [file2 ...]\n" +"Uso: apt-extracttemplates FILE1 [FILE2 ...]\n" "\n" -"apt-extracttemplates un tool per estrarre configurazioni e template\n" +"apt-extracttemplates è uno strumento per estrarre configurazioni e template\n" "dai pacchetti debian\n" "\n" "Opzioni:\n" -" -h Questo help.\n" +" -h Mostra questo aiuto\n" " -t Imposta la directory temporanea\n" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, come -o dir::cache=/tmp\n" @@ -317,31 +320,31 @@ msgstr "Impossibile scrivere in %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Impossibile trovare una versione di debconf. Debconf installato?" +msgstr "Impossibile trovare la versione di debconf. È installato?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "L'estensione del pacchetto troppo lunga" +msgstr "L'elenco dell'estensione del pacchetto è troppo lungo" #: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 #: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 #: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 #, c-format msgid "Error processing directory %s" -msgstr "Errore durante l'analisi della directory %s" +msgstr "Errore nell'elaborare la directory %s" #: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "L'estensione del sorgente troppo lunga" +msgstr "L'elenco dell'estensione del sorgente è troppo lungo" #: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "Errore nella scrittura dell'header nel file contents" +msgstr "Errore nella scrittura dell'intestazione nel file \"contents\"" #: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Errore nell'analisi dei contents %s" +msgstr "Errore nell'analisi dei \"contents\" %s" #: ftparchive/apt-ftparchive.cc:553 msgid "" @@ -384,46 +387,45 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option" msgstr "" -"Utilizzo: apt-ftparchive [opzioni] comando\n" -"Comandi: packages pathaibinari [filedioverride [pathprefix]\n" -" sources pathaisorgenti [filedioverride [pathprefix]\n" -" contents path\n" -" release path\n" -" generate config [gruppi]\n" -" clean config\n" +"Uso: apt-ftparchive [OPZIONI] COMANDO\n" +"Comandi: packages PERCORSO_AL_BINARIO [FILE_OVERRIDE [PREFISSO_PERCORSO]\n" +" sources PERCORSO_AI_SORGENTI [FILE_OVERRIDE [PREFISSO_PERCORSO]\n" +" contents PERCORSO\n" +" release PERCORSO\n" +" generate CONFIGURAZIONE [GRUPPI]\n" +" clean CONFIGURAZIONE\n" "\n" "apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n" -"molti stili di generazione da completamente automatici a alternative\n" +"molti stili di generazione da completamente automatici ad alternative\n" "funzionali per dpkg-scanpackages e dpkg-scansources\n" "\n" -"apt-ftparchive genera file Packages da un albero di .deb. Il\n" -"file Package contiene le informazioni di tutti i campi control da ogni\n" -"pacchetto cos come l'hash MD5 e la dimensione del file. Un file override\n" -" supportato per forzare il valore di Priorit e Sezione.\n" +"apt-ftparchive genera file Packages da un albero di \".deb\". Il file\n" +"Package contiene le informazioni di tutti i campi control da ogni\n" +"pacchetto, così come l'hash MD5 e la dimensione del file. Un file override\n" +"è supportato per forzare i valori di priorità e sezione.\n" "\n" -"Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n" -"L'opzione --source-override pu essere usata per specificare un file\n" +"Similmente, apt-ftparchive genera file Sources da un albero di .dscs.\n" +"L'opzione --source-override può essere usata per specificare un file\n" "di override per i sorgenti\n" "\n" -"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n" -"dell'albero. BinaryPath deve puntare alla base della ricerca \n" +"I comandi \"packages\" e \"sources\" devono essere eseguiti nella root \n" +"dell'albero. Il percorso al binario deve puntare alla base della ricerca \n" "ricorsiva e il file override deve contenere le opzioni di override.\n" -"Pathprefix \n" -" aggiunto al campo filename se presente. Esempio di utilizzo \n" -"dall'archivio debian:\n" +"Il prefisso del percorso è aggiunto al campo filename se presente. Esempio\n" +"di utilizzo dall'archivio Debian:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages \n" "\n" "Opzioni:\n" -" -h Questo help\n" -" --md5 Controlla la generazione del MD5\n" -" -s=? File override dei sorgenti\n" -" -q Silenzioso\n" -" -d=? Seleziona il database di cache opzionale\n" -" --no-delink Abilita modalit di debug del delinking\n" -" --contents Controlla la generazione del file contents\n" -" -c=? Legge come configurazione il file specificato\n" -" -o=? Imposta un'opzione arbitraria di configurazione" +" -h Mostra questo aiuto\n" +" --md5 Controlla la generazione dell'MD5\n" +" -s=? File override dei sorgenti\n" +" -q Silenzioso\n" +" -d=? Seleziona il database di cache opzionale\n" +" --no-delink Abilita la modalità di debug del delinking\n" +" --contents Controlla la generazione del file \"contents\"\n" +" -c=? Legge come configurazione il file specificato\n" +" -o=? Imposta un'opzione arbitraria di configurazione" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" @@ -432,54 +434,57 @@ msgstr "Nessuna selezione corrisponde" #: ftparchive/apt-ftparchive.cc:832 #, c-format msgid "Some files are missing in the package file group `%s'" -msgstr "Mancano alcuni file nel file group di pacchetti `%s'" +msgstr "Mancano alcuni file nel file group di pacchetti \"%s\"" #: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB era corrotto, il file stato rinominato in %s.old" +msgstr "Il database era danneggiato, il file è stato rinominato in %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Il DB vecchio, tentativo di aggiornamento %s" +msgstr "Il database è vecchio, tentativo di aggiornamento %s" #: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -"Il formato DB non valido. Se avete aggiornato da una vecchia versione di " -"apt,rimuovete e ricreate il database." +"Il formato del database non è valido. Se è stata aggiornata una vecchia " +"versione di apt, rimuovere e ricreare il database." #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Impossibile aprire il file DB %s: %s" +msgstr "Impossibile aprire il file del database %s: %s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" -msgstr "Impossibile analizzare %s" +msgstr "Impossibile eseguire stat su %s" #: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "L'archivio non ha un campo control" +msgstr "L'archivio non ha un campo \"control\"" #: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" msgstr "Impossibile ottenere un cursore" +# (ndt) messo A per Avviso +# Inizio con la maiuscola dopo i : perché mi sa che in molti +# casi molte stringhe sono così #: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W: Impossibile leggere la directory %s\n" +msgstr "A: Impossibile leggere la directory %s\n" #: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Impossibile analizzare %s\n" +msgstr "A: Impossibile eseguire stat su %s\n" #: ftparchive/writer.cc:132 msgid "E: " @@ -487,54 +492,54 @@ msgstr "E: " #: ftparchive/writer.cc:134 msgid "W: " -msgstr "W: " +msgstr "A: " #: ftparchive/writer.cc:141 msgid "E: Errors apply to file " -msgstr "E: Errori applicati al file " +msgstr "E: Gli errori si applicano al file " #: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Impossibile risolvere %s" +msgstr "Risoluzione di %s non riuscita" #: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Visita dell'albero fallita" +msgstr "Visita dell'albero non riuscita" #: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Impossibile aprire %s" +msgstr "Apertura di %s non riuscita" #: ftparchive/writer.cc:254 #, c-format msgid " DeLink %s [%s]\n" -msgstr " DeLink %s [%s]\n" +msgstr " Delink %s [%s]\n" #: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Impossibile eseguire readlink su %s" +msgstr "Esecuzione di readlink su %s non riuscita" #: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Impossibile eseguire unlink su %s" +msgstr "Esecuzione di unlink su %s non riuscita" #: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Impossibile eseguire link tra %s e %s" +msgstr "*** Collegamento di %s a %s non riuscito" #: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink limite di %sB raggiunto.\n" +msgstr " Raggiunto il limite di Delink di %sB.\n" #: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "L'archivio non ha un campo package" +msgstr "L'archivio non ha un campo \"package\"" #: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format @@ -544,7 +549,7 @@ msgstr " %s non ha un campo override\n" #: ftparchive/writer.cc:440 ftparchive/writer.cc:698 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s maintainer %s non %s\n" +msgstr " il responsabile di %s è %s non %s\n" #: ftparchive/writer.cc:620 #, c-format @@ -554,16 +559,16 @@ msgstr " %s non ha un campo source override\n" #: ftparchive/writer.cc:624 #, c-format msgid " %s has no binary override entry either\n" -msgstr " %s non ha neppure un campo binary override\n" +msgstr " %s non ha neppure un campo binario override\n" #: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Errore interno, impossibile trovare il campo %s" +msgstr "Errore interno, impossibile trovare il membro %s" #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - Impossibile allocare memoria" +msgstr "realloc - Allocazione della memoria non riuscita" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format @@ -573,27 +578,27 @@ msgstr "Impossibile aprire %s" #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format msgid "Malformed override %s line %lu #1" -msgstr "Override malformato %s linea %lu #1" +msgstr "Override non corretto: file %s riga %lu #1" #: ftparchive/override.cc:74 ftparchive/override.cc:178 #, c-format msgid "Malformed override %s line %lu #2" -msgstr "Override malformato %s linea %lu #2" +msgstr "Override non corretto: file %s riga %lu #2" #: ftparchive/override.cc:88 ftparchive/override.cc:191 #, c-format msgid "Malformed override %s line %lu #3" -msgstr "Override malformato %s linea %lu #3" +msgstr "Override non corretto: file %s riga %lu #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Impossibile leggere il file override %s" +msgstr "Lettura del file override %s non riuscita" #: ftparchive/multicompress.cc:72 #, c-format msgid "Unknown compression algorithm '%s'" -msgstr "Algoritmo di compressione '%s' sconosciuto" +msgstr "Algoritmo di compressione \"%s\" sconosciuto" #: ftparchive/multicompress.cc:102 #, c-format @@ -602,15 +607,15 @@ msgstr "L'output compresso %s necessita di un insieme di compressione" #: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Impossibile creare un pipe IPC verso il sottoprocesso" +msgstr "Creazione di una pipe IPC verso il sottoprocesso non riuscita" #: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Impossibile creare FILE*" +msgstr "Creazione di FILE* non riuscita" #: ftparchive/multicompress.cc:198 msgid "Failed to fork" -msgstr "Impossibile eseguire fork" +msgstr "Fork non riuscita" #: ftparchive/multicompress.cc:212 msgid "Compress child" @@ -619,15 +624,15 @@ msgstr "Sottoprocesso compresso" #: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Errore interno, impossibile creare %s" +msgstr "Errore interno, creazione di %s non riuscita" #: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Impossibile creare un sottoprocesso IPC" +msgstr "Creazione di un sottoprocesso IPC non riuscita" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Impossibile eseguire compressor" +msgstr "Esecuzione di compressor non riuscita" #: ftparchive/multicompress.cc:360 msgid "decompressor" @@ -635,11 +640,11 @@ msgstr "decompressore" #: ftparchive/multicompress.cc:403 msgid "IO to subprocess/file failed" -msgstr "I/O al sottoprocesso/file fallito" +msgstr "I/O al sottoprocesso/file non riuscito" #: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Impossibile leggere durante l'elaborazione MD5" +msgstr "Lettura durante l'elaborazione MD5 non riuscita" #: ftparchive/multicompress.cc:472 #, c-format @@ -649,7 +654,7 @@ msgstr "Problema nell'unlink di %s" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Impossibile rinominare %s in %s" +msgstr "Rinomina di %s in %s non riuscita" #: cmdline/apt-get.cc:124 msgid "Y" @@ -658,7 +663,7 @@ msgstr "S" #: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" -msgstr "Errore di compilazione della regex - %s" +msgstr "Errore di compilazione dell'espressione regolare - %s" #: cmdline/apt-get.cc:241 msgid "The following packages have unmet dependencies:" @@ -667,7 +672,7 @@ msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:" #: cmdline/apt-get.cc:331 #, c-format msgid "but %s is installed" -msgstr "ma %s installato" +msgstr "ma %s è installato" #: cmdline/apt-get.cc:333 #, c-format @@ -676,15 +681,15 @@ msgstr "ma %s sta per essere installato" #: cmdline/apt-get.cc:340 msgid "but it is not installable" -msgstr "ma non installabile" +msgstr "ma non è installabile" #: cmdline/apt-get.cc:342 msgid "but it is a virtual package" -msgstr "ma un pacchetto virtuale" +msgstr "ma è un pacchetto virtuale" #: cmdline/apt-get.cc:345 msgid "but it is not installed" -msgstr "ma non installato" +msgstr "ma non è installato" #: cmdline/apt-get.cc:345 msgid "but it is not going to be installed" @@ -696,7 +701,7 @@ msgstr " oppure" #: cmdline/apt-get.cc:379 msgid "The following NEW packages will be installed:" -msgstr "I seguenti pacchetti NUOVI (NEW) saranno installati:" +msgstr "I seguenti pacchetti NUOVI saranno installati:" #: cmdline/apt-get.cc:405 msgid "The following packages will be REMOVED:" @@ -712,7 +717,7 @@ msgstr "I seguenti pacchetti saranno aggiornati:" #: cmdline/apt-get.cc:469 msgid "The following packages will be DOWNGRADED:" -msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):" +msgstr "I seguenti pacchetti saranno RETROCESSI:" #: cmdline/apt-get.cc:489 msgid "The following held packages will be changed:" @@ -728,9 +733,9 @@ msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"ATTENZIONE: il seguente pacchetto ESSENZIALE sta per essere rimosso\n" +"ATTENZIONE: i seguenti pacchetti essenziali stanno per essere rimossi.\n" "Questo non dovrebbe essere fatto a meno che non si sappia esattamente cosa " -"si sta facendo!" +"si sta facendo." #: cmdline/apt-get.cc:581 #, c-format @@ -745,7 +750,7 @@ msgstr "%lu reinstallati, " #: cmdline/apt-get.cc:587 #, c-format msgid "%lu downgraded, " -msgstr "%lu retrocessi (downgraded), " +msgstr "%lu retrocessi, " #: cmdline/apt-get.cc:589 #, c-format @@ -759,11 +764,11 @@ msgstr "%lu non completamente installati o rimossi.\n" #: cmdline/apt-get.cc:667 msgid "Correcting dependencies..." -msgstr "Correzione delle dipendenze in corso..." +msgstr "Correzione delle dipendenze..." #: cmdline/apt-get.cc:670 msgid " failed." -msgstr " fallita." +msgstr " non riuscita." #: cmdline/apt-get.cc:673 msgid "Unable to correct dependencies" @@ -780,7 +785,7 @@ msgstr " Fatto" #: cmdline/apt-get.cc:682 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -" consigliabile eseguire `apt-get -f install' per correggere questi problemi." +"È utile eseguire \"apt-get -f install\" per correggere questi problemi." #: cmdline/apt-get.cc:685 msgid "Unmet dependencies. Try using -f." @@ -788,61 +793,62 @@ msgstr "Dipendenze non trovate. Riprovare usando -f." #: cmdline/apt-get.cc:707 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!" +msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati." #: cmdline/apt-get.cc:711 msgid "Authentication warning overridden.\n" -msgstr "Avviso di autenticazione disabilitato \n" +msgstr "Avviso di autenticazione disabilitato.\n" #: cmdline/apt-get.cc:718 msgid "Install these packages without verification [y/N]? " -msgstr "Installare questi pacchetti senza la verifica [s/N]? " +msgstr "Installare questi pacchetti senza verificarli [s/N]? " #: cmdline/apt-get.cc:720 msgid "Some packages could not be authenticated" -msgstr "Non stato possibile autenticare alcuni pacchetti" +msgstr "Alcuni pacchetti non possono essere autenticati" #: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Sussistono dei problemi e -y stata usata senza --force-yes" +msgstr "Si sono verificati dei problemi ed è stata usata -y senza --force-yes" #: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -"Errore interno, InstallPackages stato chiamato con un pacchetto rotto!" +"Errore interno, InstallPackages è stato chiamato con un pacchetto " +"danneggiato." #: cmdline/apt-get.cc:782 msgid "Packages need to be removed but remove is disabled." -msgstr "I pacchetti devono essere rimossi ma il remove disabilitato." +msgstr "" +"I pacchetti devono essere rimossi, ma l'azione di rimozione è disabilitata." #: cmdline/apt-get.cc:793 msgid "Internal error, Ordering didn't finish" -msgstr "Errore interno, l'ordinamento non terminato" +msgstr "Errore interno, l'ordinamento non è stato terminato" #: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Impossibile creare un lock sulla directory di download" +msgstr "Impossibile bloccare la directory di scaricamento" #: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." -msgstr "La lista dei sorgenti non pu essere letta." +msgstr "Impossibile leggere l'elenco dei sorgenti." #: cmdline/apt-get.cc:834 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Che strano... le dimensioni non corrispondono, inviare un'email a " -"apt@packages.debian.org" +"Le dimensioni non corrispondono. Inviare un'email a: apt@packages.debian.org" #: cmdline/apt-get.cc:839 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr " necessario prendere %sB/%sB di archivi. \n" +msgstr "È necessario scaricare %sB/%sB di archivi.\n" #: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB of archives.\n" -msgstr " necessario prendere %sB di archivi. \n" +msgstr "È necessario scaricare %sB di archivi.\n" #: cmdline/apt-get.cc:847 #, c-format @@ -862,17 +868,17 @@ msgstr "Impossibile determinare lo spazio libero su %s" #: cmdline/apt-get.cc:871 #, c-format msgid "You don't have enough free space in %s." -msgstr "Lo spazio libero in %s non sufficiente." +msgstr "Spazio libero in %s insufficiente." #: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -" stata specificata la modalit Trivial Only ma questa non un'operazione " -"triviale" +"È stata specificata la modalità \"Trivial Only\", ma questa non è " +"un'operazione banale." #: cmdline/apt-get.cc:889 msgid "Yes, do as I say!" -msgstr "SI, esegui come richiesto!" +msgstr "Sì, esegui come da richiesta." #: cmdline/apt-get.cc:891 #, c-format @@ -881,8 +887,8 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Si sta per compiere un'azione potenzialmente pericolosa\n" -"Per continuare scrivere la frase '%s' \n" +"Si sta per compiere un'azione potenzialmente pericolosa.\n" +"Per continuare scrivere la frase \"%s\"\n" " ?] " #: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 @@ -896,57 +902,56 @@ msgstr "Continuare [S/n]? " #: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Impossibile ottenere %s %s\n" +msgstr "Impossibile recuperare %s %s\n" #: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Il download di alcuni file fallito" +msgstr "Scaricamento di alcuni file non riuscito" #: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Download completato e in modalit download-only" +msgstr "Scaricamento completato e in modalità solo scaricamento" #: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Impossibile prendere alcuni archivi, forse meglio eseguire apt-get update " -"o provare l'opzione --fix-missing" +"Impossibile recuperare alcuni pacchetti. Potrebbe essere utile eseguire " +"\"apt-get update\" o provare l'opzione \"--fix-missing\"." #: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing su media estraibili non ancora supportato" +msgstr "--fix-missing su supporti estraibili non è ancora supportato" #: cmdline/apt-get.cc:1018 msgid "Unable to correct missing packages." -msgstr "Impossibile correggere i pacchetti mancanti" +msgstr "Impossibile correggere i pacchetti mancanti." #: cmdline/apt-get.cc:1019 msgid "Aborting install." -msgstr "Interruzione dell'installazione in corso." +msgstr "Interruzione dell'installazione." #: cmdline/apt-get.cc:1053 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Nota, si sta selezionando %s al posto di %s\n" +msgstr "Nota, viene selezionato %s al posto di %s\n" #: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"%s stato saltato, perch gi installato e l'aggiornamento non stato " -"impostato.\n" +"Viene saltato %s poiché è già installato e l'aggiornamento non è impostato.\n" #: cmdline/apt-get.cc:1081 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Il pacchetto %s non installato, quindi non stato rimosso\n" +msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n" #: cmdline/apt-get.cc:1092 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "Il pacchetto %s un pacchetto virtuale fornito da:\n" +msgstr "Il pacchetto %s è un pacchetto virtuale fornito da:\n" #: cmdline/apt-get.cc:1104 msgid " [Installed]" @@ -954,7 +959,7 @@ msgstr " [Installato]" #: cmdline/apt-get.cc:1109 msgid "You should explicitly select one to install." -msgstr "Bisogna esplicitamente sceglierne uno da installare." +msgstr "È necessario sceglierne uno da installare." #: cmdline/apt-get.cc:1114 #, c-format @@ -963,9 +968,9 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"Il pacchetto %s non ha versioni disponibili, ma nominato da un altro\n" -"pacchetto. Questo significa che il pacchetto manca, diventato obsoleto\n" -"o disponibile solo all'interno di un'altra sorgente\n" +"Il pacchetto %s non ha versioni disponibili, ma è nominato da un altro\n" +"pacchetto. Questo significa che il pacchetto manca, è diventato obsoleto\n" +"oppure è disponibile solo all'interno di un'altra sorgente\n" #: cmdline/apt-get.cc:1133 msgid "However the following packages replace it:" @@ -979,27 +984,29 @@ msgstr "Il pacchetto %s non ha candidati da installare" #: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "La reinstallazione di %s non possibile, non pu essere scaricato.\n" +msgstr "La reinstallazione di %s non è possibile, non può essere scaricato.\n" #: cmdline/apt-get.cc:1164 #, c-format msgid "%s is already the newest version.\n" -msgstr "%s gi alla versione pi recente.\n" +msgstr "%s è già alla versione più recente.\n" +# (ndt) dovrebbe essere inteso il file Release #: cmdline/apt-get.cc:1193 #, c-format msgid "Release '%s' for '%s' was not found" -msgstr "Non stata trovata la release '%s' per '%s'" +msgstr "Release \"%s\" per \"%s\" non trovato." +# (ndt) dovrebbe essere inteso il Version #: cmdline/apt-get.cc:1195 #, c-format msgid "Version '%s' for '%s' was not found" -msgstr "Non stata trovata la versione '%s' per '%s'" +msgstr "Version \"%s\" per \"%s\" non trovato" #: cmdline/apt-get.cc:1201 #, c-format msgid "Selected version %s (%s) for %s\n" -msgstr "Versione selezionata %s (%s) per %s\n" +msgstr "Versione %s (%s) selezionata per %s\n" #: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" @@ -1007,32 +1014,32 @@ msgstr "Il comando update non accetta argomenti" #: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" -msgstr "Impossibile creare un lock sulla directory di list" +msgstr "Impossibile bloccare la directory" #: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -"Non siamo autorizzati a rimuovere nulla, impossibile avviare AutoRemover" +"Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" #: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -"I seguenti pacchetti erano stati automaticamente installati e non sono pi " +"I seguenti pacchetti sono stati installati automaticamente e non sono più " "richiesti:" #: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." -msgstr "Usare 'apt-get autoremove' per rimuoverli." +msgstr "Usare \"apt-get autoremove\" per rimuoverli." #: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"Hmm, sembra che AutoRemover abbia distrutto qualcosa e questo\n" -"non dovrebbe accadere. Si prega di compilare un bug report per apt." +"Sembra che AutoRemover abbia rovinato qualcosa e questo\n" +"non doveva accadere. Segnalare un bug riguardo apt." #. #. if (Packages == 1) @@ -1050,11 +1057,11 @@ msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " #: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Errore interno, AutoRemover ha dato problemi" +msgstr "Errore interno, AutoRemover ha rovinato qualche cosa" #: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Errore interno, AllUpgrade ha rotto qualcosa" +msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" #: cmdline/apt-get.cc:1523 #, c-format @@ -1064,30 +1071,30 @@ msgstr "Impossibile trovare il task %s" #: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" -msgstr "Impossibile trovare %s" +msgstr "Impossibile trovare il pacchetto %s" #: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Nota, si sta selezionando %s per la regex '%s'\n" +msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n" #: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" -msgstr "%s impostato per installazione manuale.\n" +msgstr "È stato impostato %s per l'installazione manuale.\n" #: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -" consigliabile eseguire 'apt-get -f install' per correggere questi problemi:" +"È utile eseguire \"apt-get -f install\" per correggere questi problemi:" #: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o " -"specificare una soluzione)." +"Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " +"(o specificare una soluzione)." #: cmdline/apt-get.cc:1720 msgid "" @@ -1096,18 +1103,18 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"Alcuni pacchetti non possono essere installati. Questo pu voler\n" -"dire che stata richiesta una situazione impossibile oppure, se\n" -"si sta usando la distribuzione \"unstable\", che alcuni pacchetti\n" -"richiesti non sono ancora stati creati o rimossi da incoming." +"Alcuni pacchetti non possono essere installati. Questo può voler dire\n" +"che è stata richiesta una situazione impossibile oppure, se si sta\n" +"usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n" +"non sono ancora stati creati o sono stati rimossi da Incoming." #: cmdline/apt-get.cc:1738 msgid "Broken packages" -msgstr "Pacchetto non integro" +msgstr "Pacchetto danneggiato" #: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" -msgstr "I seguenti pacchetti verranno inoltre installati:" +msgstr "I seguenti pacchetti saranno inoltre installati:" #: cmdline/apt-get.cc:1856 msgid "Suggested packages:" @@ -1119,23 +1126,24 @@ msgstr "Pacchetti raccomandati:" #: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " -msgstr "Calcolo dell'aggiornamento in corso... " +msgstr "Calcolo dell'aggiornamento... " #: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" -msgstr "Fallito" +msgstr "Non riuscito" #: cmdline/apt-get.cc:1893 msgid "Done" -msgstr "Fatto" +msgstr "Eseguito" #: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" -msgstr "Errore interno, problem resolver ha rotto qualcosa" +msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" #: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" -msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente" +msgstr "" +"È necessario specificare almeno un pacchetto di cui recuperare il sorgente" #: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format @@ -1145,71 +1153,71 @@ msgstr "Impossibile trovare un pacchetto sorgente per %s" #: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Si saltato il file gi scaricato '%s'\n" +msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" #: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" -msgstr "Lo spazio libero in %s non sufficiente" +msgstr "Lo spazio libero in %s è insufficiente" #: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr " necessario prendere %sB/%sB di sorgenti.\n" +msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" #: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr " necessario prendere %sB di sorgenti\n" +msgstr "È necessario recuperare %sB di sorgenti\n" #: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Prelievo del sorgente %s\n" +msgstr "Recupero sorgente %s\n" #: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Non stato possibile scaricare alcuni archivi." +msgstr "Recupero di alcuni archivi non riuscito." #: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n" +msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" #: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Comando di estrazione '%s' fallito.\n" +msgstr "Comando di estrazione \"%s\" non riuscito.\n" #: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Verificare se il pacchetto 'dpkg-dev' installato.\n" +msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" #: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" -msgstr "Comando di costruzione '%s' fallito.\n" +msgstr "Comando \"%s\" di generazione non riuscito.\n" #: cmdline/apt-get.cc:2298 msgid "Child process failed" -msgstr "Processo figlio fallito" +msgstr "Creazione processo figlio non riuscita" #: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Bisogna specificare almeno un pacchetto di cui controllare la generazione di " -"dipendenze" +"È necessario specificare almeno un pacchetto di cui controllare le " +"dipendenze di generazione" #: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Impossibile ottenere informazioni di dipendenza di costruzione per %s" +msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" #: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" -msgstr "%s non ha dipendenze di costruzione.\n" +msgstr "%s non ha dipendenze di generazione.\n" #: cmdline/apt-get.cc:2414 #, c-format @@ -1217,8 +1225,8 @@ msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perch non si trova il " -"pacchetto %s" +"%s dipendenze per %s non possono essere soddisfatte perchè il pacchetto %s " +"non può essere trovato" #: cmdline/apt-get.cc:2467 #, c-format @@ -1226,29 +1234,29 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perch nessuna versione " -"del pacchetto %s pu soddisfare le richieste di versione" +"%s dipendenze per %s non possono essere soddisfatte perchè nessuna versione " +"del pacchetto %s può soddisfare le richieste di versione" #: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"La dipendenza %s per %s non stata soddisfatta: il pacchetto installato %s " -" troppo nuovo" +"La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " +"è troppo nuovo" #: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "La dipendenza %s per %s: %s fallita" +msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" #: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Non stato possibile soddisfare le dipendenze di costruzione per %s." +msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." #: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" -msgstr "Il calcolo delle dipendenze per la costruzione fallito" +msgstr "Elaborazione delle dipendenze di generazione non riuscita" #: cmdline/apt-get.cc:2578 msgid "Supported modules:" @@ -1297,56 +1305,59 @@ msgid "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" msgstr "" -"Utilizzo: apt-get [opzioni] comando\n" -" apt-get [opzioni] install|remove pkg1 [pkg2 ...]\n" -" apt-get [opzioni] source pkg1 [pkg2 ...]\n" +"Uso: apt-get [OPZIONI] COMANDO\n" +" apt-get [OPZIONI] install|remove PKG1 [PKG2 ...]\n" +" apt-get [OPZIONI] source PKG1 [PKG2 ...]\n" "\n" -"apt-get una semplice interfaccia a linea di comando per scaricare \n" -"e installare pacchetti. I comandi pi usati sono update \n" +"apt-get è una semplice interfaccia a riga di comando per scaricare \n" +"e installare pacchetti. I comandi più usati sono update \n" "e install.\n" "\n" "Comandi:\n" -" update - Scarica la nuova lista di pacchetti\n" +" update - Scarica l'elenco dei pacchetti aggiornato\n" " upgrade - Esegue un aggiornamento dei pacchetti installati\n" -" install - Installa nuovi pacchetti (il pkg libc6 non libc6.deb)\n" -" remove - Rimuove pacchetti\n" -" autoremove - Rimuove automaticamente pacchetti inutilizzati\n" -" purge - Rimuove completamente i pacchetti\n" +" install - Installa nuovi pacchetti (PKG è libc6 non libc6.deb)\n" +" remove - Rimuove i pacchetti\n" +" autoremove - Rimuove automaticamente i pacchetti inutilizzati\n" +" purge - Rimuove i pacchetti e la loro configurazione\n" " source - Scarica i pacchetti sorgente\n" " build-dep - Configura le dipendenze di compilazione per i pacchetti " "sorgente\n" -" dist-upgrade - Aggiornamento della distribuzione, vedere apt-get(8)\n" +" dist-upgrade - Esegue un avanzamento della distribuzione, vedere apt-get" +"(8)\n" " dselect-upgrade - Segue le selezioni di dselect\n" -" clean - Cancella l'archivio temporaneo dei pacchetti scaricati \n" -" autoclean - Cancella vecchi archivi temporanei di pacchetti scaricati\n" +" clean - Elimina i file dei pacchetti scaricati \n" +" autoclean - Elimina i vecchi pacchetti scaricati\n" " check - Verifica che non ci siano dipendenze insoddisfatte\n" "\n" "Opzioni:\n" -" -h Questo help.\n" -" -q Output registrabile - nessun indicatore di progresso\n" -" -qq Nessun output eccetto per gli errori\n" -" -d Solamente download - NON installa o decomprime gli archivi\n" -" -s Nessuna azione. Simula i passi in ordine\n" -" -y Assume s a tutte le domande e non chiede conferma\n" -" -f Tenta di continuare se il controllo di integrit fallisce\n" +" -h Mostra questo aiuto\n" +" -q Output registrabile, nessun indicatore di avanzamento\n" +" -qq Nessun output eccetto gli errori\n" +" -d Scarica solamente, NON installa o decomprime gli archivi\n" +" -s Nessuna azione, simula i passi in ordine\n" +" -y Assume una risposta affermativa a tutte le domande e non chiede " +"conferma\n" +" -f Tenta di continuare se il controllo di integrità non riesce\n" " -m Tenta di continuare se gli archivi non si trovano\n" -" -u Mostra una lista dei pacchetti da aggiornare\n" -" -b Costruisce il pacchetto sorgente dopo averlo scaricato\n" -" -V Mostra dettagliatamente i numeri di versione\n" +" -u Mostra un elenco dei pacchetti da aggiornare\n" +" -b Genera il pacchetto sorgente dopo averlo recuperato\n" +" -V Mostra prolissamente i numeri di versione\n" " -c=? Legge come configurazione il file specificato\n" " -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n" -"Consultare le pagine apt-get(8), sources.list(5) e apt.conf(5) del manuale\n" -"per maggiori informazioni e opzioni.\n" -" Questo APT ha i Poteri della Super Mucca.\n" +"Per maggiori informazioni e opzioni, consultare le pagine di manuale\n" +"apt-get(8), sources.list(5) e apt.conf(5).\n" +" Questo APT ha i poteri della Super Mucca.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "Hit " +msgstr "Trovato " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Get:" +msgstr "Scaricare:" +# (ndt) questa non so cosa voglia dire #: cmdline/acqprogress.cc:110 msgid "Ign " msgstr "Ign " @@ -1358,12 +1369,12 @@ msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Scaricato %sB in %s (%sB/s)\n" +msgstr "Recuperati %sB in %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [In corso]" +msgstr " [In lavorazione]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1372,13 +1383,13 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Cambio disco: Inserire il disco chiamato\n" -" '%s'\n" -"nel dispositivo '%s' e premere invio\n" +"Cambio disco: inserire il disco chiamato\n" +" \"%s\"\n" +"nel dispositivo \"%s\" e premere Invio\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" -msgstr "Campo del pacchetto sconosciuto!" +msgstr "Record del pacchetto sconosciuto." #: cmdline/apt-sortpkgs.cc:150 msgid "" @@ -1393,54 +1404,55 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Utilizzo: apt-sortpkgs [opzioni] file1 [file2 ...]\n" +"Uso: apt-sortpkgs [OPZIONI] FILE1 [FILE2 ...]\n" "\n" -"apt-sortpkgs un semplice tool per ordinare il file dei pacchetti. " -"L'opzione -s\n" -" usata per indicare che tipo di file .\n" +"apt-sortpkgs è uno strumento per ordinare i file dei pacchetti.\n" +"L'opzione -s è usata per indicare il tipo di file.\n" "\n" "Opzioni:\n" -" -h Questo help\n" +" -h Mostra questo aiuto\n" " -s Ordina per pacchetto sorgente\n" " -c=? Legge come configurazione il file specificato\n" -" -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n" +" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Opzione predefinita errata!" +msgstr "Impostazione predefinita errata." #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Premere invio per continuare." +msgstr "Premere Invio per continuare." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Cancellare tutti i file deb precedentemente scaricati?" +msgstr "Eliminare tutti i file .deb precedentemente scaricati?" # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. #: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Si sono verificati alcuni errori nella scompattazione. Si cercher di " +msgstr "" +"Si sono verificati alcuni errori nell'estrazione. Verrà tentato di " +"configurare " #: dselect/install:102 msgid "packages that were installed. This may result in duplicate errors" msgstr "" -"configurare i pacchetti che sono stati installati. Questo potrebbe generare " +"i pacchetti che sono stati installati. Questo potrebbe generare molteplici " #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"errori duplicati o errori causati da dipendenze non soddisfatte. Questo va " +"errori o errori causati da dipendenze mancanti. Questo non causa problemi, " #: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" -" bene solo se gli errori sopra questo messaggio sono importanti. Si prega " -"di correggerli e di eseguire [I]nstall un'altra volta" +"gli errori precedenti sono importanti. Correggerli e rieseguire " +"l'installazione" #: dselect/update:30 msgid "Merging available information" @@ -1448,24 +1460,24 @@ msgstr "Aggiornamento delle informazioni disponibili" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Impossibile creare delle pipe" +msgstr "Creazione delle pipe non riuscita" #: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Impossibile eseguire gzip " +msgstr "Esecuzione di gzip non riuscita" #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" -msgstr "Archivio corrotto" +msgstr "Archivio danneggiato" #: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Checksum di tar fallito, archivio corrotto" +msgstr "Checksum di tar non riuscito, archivio danneggiato" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Tipo %u nell'header del tar sconosciuto, member %s" +msgstr "Intestazione TAR di tipo %u sconosciuta, member %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" @@ -1473,19 +1485,19 @@ msgstr "Firma dell'archivio non valida" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Errore nella lettura del member header dell'archivio" +msgstr "Errore nel leggere l'intestazione member dell'archivio" #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "Member header dell'archivio non valido" +msgstr "Intestazione member dell'archivio non valida" #: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "L'archivio troppo corto" +msgstr "L'archivio è troppo piccolo" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Impossibile leggere gli header dell'archivio" +msgstr "Lettura delle intestazioni dell'archivio non riuscita" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" @@ -1493,11 +1505,11 @@ msgstr "Dropnode invocata su un nodo ancora collegato" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Impossibile localizzare l'elemento hash!" +msgstr "Localizzazione dell'elemento hash non riuscita." #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Impossibile allocare la deviazione" +msgstr "Allocazione della deviazione non riuscita" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1506,8 +1518,7 @@ msgstr "Errore interno in AddDiversion" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "" -"Tentativo di sovrascrittura di una deviazione in corso, %s -> %s e %s/%s" +msgstr "Tentativo di sovrascrivere una deviazione, %s -> %s e %s/%s" #: apt-inst/filelist.cc:506 #, c-format @@ -1517,42 +1528,42 @@ msgstr "Doppia aggiunta di deviazione %s -> %s" #: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "File di configurazione duplice %s/%s" +msgstr "File di configurazione duplicato %s/%s" #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Impossibile scrivere il file %s" +msgstr "Scrittura del file %s non riuscita" #: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Chiusura del file %s fallita" +msgstr "Chiusura del file %s non riuscita" #: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" -msgstr "Il path %s troppo lungo" +msgstr "Il percorso %s è troppo lungo" #: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Estrazione di %s eseguita pi di una volta" +msgstr "Estrazione di %s eseguita più di una volta" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "La directory %s deviata" +msgstr "La directory %s è deviata" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -"Il pacchetto sta cercando di scrivere nella deviazione di destinazione %s/%s" +"Il pacchetto sta cercando di scrivere nell'obiettivo di destinazione %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "Il path della deviazione troppo lungo" +msgstr "Il percorso della deviazione è troppo lungo" #: apt-inst/extract.cc:240 #, c-format @@ -1561,11 +1572,11 @@ msgstr "La directory %s sta per essere sostituita da una non-directory" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Impossibile localizzare il nodo nel suo hash bucket" +msgstr "Localizzazione del nodo nel suo hash bucket non riuscita" #: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "Il path troppo lungo" +msgstr "Il percorso è troppo lungo" #: apt-inst/extract.cc:414 #, c-format @@ -1587,12 +1598,12 @@ msgstr "Impossibile leggere %s" #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Impossibile analizzare %s" +msgstr "Impossibile eseguire stat su %s" #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "Impossibile rimuovere %s" +msgstr "Rimozione di %s non riuscita" #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format @@ -1602,32 +1613,32 @@ msgstr "Impossibile creare %s" #: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Impossibile analizzare %sinfo" +msgstr "Esecuzione di stat su %sinfo non riuscita" #: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Le directory temp e info devono essere sullo stesso filesystem" +msgstr "Le directory temp e info devono essere sullo stesso file system" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760 #: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834 #: apt-pkg/pkgcachegen.cc:957 msgid "Reading package lists" -msgstr "Lettura della lista dei pacchetti in corso" +msgstr "Lettura elenco dei pacchetti" #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Impossibile raggiungere la directory admin %sinfo" +msgstr "Cambio della directory admin %sinfo non riuscito" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" -msgstr "Errore interno nel prendere un nome di un pacchetto" +msgstr "Errore interno nel recuperare un nome di un pacchetto" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Lettura della lista dei file in corso" +msgstr "Lettura elenco dei file" #: apt-inst/deb/dpkgdb.cc:212 #, c-format @@ -1636,37 +1647,37 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Impossibile aprire file di lista '%sinfo%s'. Se non si pu ripristinare " -"questo file allora crearne uno vuoto e reinstallare immediatamente la stessa " -"versione del pacchetto!" +"Impossibile aprire il file dell'elenco \"%sinfo/%s\". Se non è possibile " +"ripristinarlo, crearne uno vuoto e reinstallare immediatamente la stessa " +"versione del pacchetto." #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Errore nella lettura del file di lista %sinfo%s" +msgstr "Lettura del file dell'elenco %sinfo/%s non riuscita" #: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" -msgstr "Errore interno nel prendere un nodo" +msgstr "Errore interno nel recuperare un nodo" #: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "Impossibile aprire il file di diversion %sdiversions" +msgstr "Apertura del file di deviazione %sdiversions non riuscita" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Il file di diversion corrotto" +msgstr "Il file di diversion è danneggiato" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 #, c-format msgid "Invalid line in the diversion file: %s" -msgstr "Linea non valida nel file di diversion: %s" +msgstr "Riga non valida nel file di diversion: %s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Errore interno nell'aggiunta di una diversion" +msgstr "Errore interno nell'aggiungere un diversion" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -1675,57 +1686,58 @@ msgstr "La cache dei pacchetti deve prima essere inizializzata" #: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Impossibile trovare un Pacchetto: header, offset %lu" +msgstr "Impossibile trovare un Package: header, offset %lu" #: apt-inst/deb/dpkgdb.cc:461 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Sezione ConfFile nel file status non corretta. Offset %lu" +msgstr "Sezione ConfFile nel file di stato non corretta. Offset %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Errore nel parsing MD5. Offset %lu" +msgstr "Errore nell'analisi MD5. Offset %lu" #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Questo non un archivio DEB valido, member '%s' mancante" +msgstr "Questo non è un archivio DEB valido: membro \"%s\" mancante" #: apt-inst/deb/debfile.cc:50 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "Questo non un valido file DEB, campi '%s', '%s' o '%s' mancanti" +msgstr "" +"Questo non è un archivio DEB valido: membri \"%s\", \"%s\" o \"%s\" mancanti" #: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Impossibile cambiare su %s" +msgstr "Impossibile passare a %s" #: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" -msgstr "Errore interno, impossibile localizzare il campo" +msgstr "Errore interno, impossibile localizzare il membro" #: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Impossibile localizzare un file control valido" +msgstr "Impossibile localizzare un file \"control\" valido" #: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "File control non corretto" +msgstr "File \"control\" non analizzabile" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Impossibile leggere il database del cdrom %s" +msgstr "Impossibile leggere il database del CD-ROM %s" #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"Si prega di usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-" -"get update non pu essere usato per aggiungere nuovi CD-ROM" +"Usare apt-cdrom per far riconoscere questo CD-ROM da APT. apt-get update non " +"può essere usato per aggiungere nuovi CD-ROM" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -1747,15 +1759,15 @@ msgstr "File non trovato" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 #: methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" -msgstr "Impossibile analizzare" +msgstr "Esecuzione di stat non riuscita" #: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Impossibile impostare la data di modifica (modification time)" +msgstr "Impostazione della data di modifica non riuscita" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "URI non valide, le URI locali non devono iniziare con //" +msgstr "URI non valido, gli URI locali non devono iniziare con //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1764,7 +1776,7 @@ msgstr "Accesso in corso" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Impossibile determinare il nome del peer" +msgstr "Impossibile determinare il nome del nodo" #: methods/ftp.cc:173 msgid "Unable to determine the local name" @@ -1773,39 +1785,40 @@ msgstr "Impossibile determinare il nome locale" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Il server ha rifiutato la connessione e ha detto: %s" +msgstr "Il server ha rifiutato la connessione e riporta: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "USER fallito, il server ha detto: %s" +msgstr "USER non riuscito, il server riporta: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS fallito, il server ha detto: %s" +msgstr "PASS non riuscito, il server riporta: %s" #: methods/ftp.cc:237 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Si specificato un proxy server ma senza script di login, Acquire::ftp::" -"ProxyLogin vuoto." +"È stato specificato un server proxy, ma nessuno script di accesso: Acquire::" +"ftp::ProxyLogin è vuoto." #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Comando dello script di login '%s' fallito, il server ha detto: %s" +msgstr "" +"Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE fallito, il server ha detto: %s" +msgstr "TYPE non riuscito, il server riporta: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Timeout della connessione" +msgstr "Connessione scaduta" #: methods/ftp.cc:335 msgid "Server closed the connection" @@ -1821,7 +1834,7 @@ msgstr "Una risposta ha superato le dimensioni del buffer." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Corruzione nel protocollo" +msgstr "Protocollo danneggiato" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" @@ -1833,16 +1846,15 @@ msgstr "Impossibile creare un socket" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "" -"Impossibile connettersi al socket dati, tempo limite di connessione esaurito" +msgstr "Impossibile connettersi al socket dati, connessione terminata" #: methods/ftp.cc:704 msgid "Could not connect passive socket." -msgstr "Impossibile connettersi in modalit passiva" +msgstr "Impossibile connettere socket passivo." #: methods/ftp.cc:722 msgid "getaddrinfo was unable to get a listening socket" -msgstr " stato impossibile ottenere un socket in ascolto con getaddrinfo()" +msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()" #: methods/ftp.cc:736 msgid "Could not bind a socket" @@ -1868,11 +1880,11 @@ msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT fallito, il server ha detto: %s" +msgstr "EPRT non riuscito, il server riporta: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Tempo limite di connessione esaurito per il socket dati" +msgstr "Connessione al socket dati terminata" #: methods/ftp.cc:825 msgid "Unable to accept connection" @@ -1880,26 +1892,26 @@ msgstr "Impossibile accettare connessioni" #: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "Problemi nella creazione dell'hash del file" +msgstr "Si è verificato un problema nel creare l'hash del file" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Impossibile ottenere un file, il server ha detto '%s'" +msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Tempo limite esaurito per il socket dati" +msgstr "Socket dati terminato" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Trasferimento dei dati fallito, il server ha detto '%s'" +msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\"" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "Query" +msgstr "Interrogazione" #: methods/ftp.cc:1109 msgid "Unable to invoke " @@ -1908,7 +1920,7 @@ msgstr "Impossibile invocare " #: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "Connessione a %s (%s) in corso" +msgstr "Connessione a %s (%s)" #: methods/connect.cc:81 #, c-format @@ -1928,8 +1940,7 @@ msgstr "Impossibile iniziare la connessione a %s:%s (%s)." #: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "" -"Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito" +msgstr "Impossibile connettersi a %s:%s (%s), connessione terminata" #: methods/connect.cc:119 #, c-format @@ -1941,22 +1952,23 @@ msgstr "Impossibile connettersi a %s:%s (%s)." #: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "Connessione a %s in corso" +msgstr "Connessione a %s" #: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Impossibile risolvere '%s'" +msgstr "Impossibile risolvere \"%s\"" #: methods/connect.cc:190 #, c-format msgid "Temporary failure resolving '%s'" -msgstr "risoluzione di '%s' temporaneamente fallita" +msgstr "Risoluzione di \"%s\" temporaneamente non riuscita" #: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr " accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)" +msgstr "" +"Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i)" #: methods/connect.cc:240 #, c-format @@ -1966,29 +1978,29 @@ msgstr "Impossibile connettersi a %s %s:" #: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Impossibile accedere al keyring '%s'" +msgstr "Impossibile accedere al portachiavi: \"%s\"" #: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" -"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso." +msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita." #: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Errore interno: Firma corretta, ma non stato possibile determinare il " -"fingerprint della chiave?!" +"Errore interno: firma corretta, ma non è possibile determinare l'impronta " +"della chiave." #: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "Almeno una firma non valida stata trovata." +msgstr "È stata trovata almeno una fima non valida." #: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Impossibile esseguire '%s' per verificare la firma (gpgv installato?)" +"Impossibile esseguire \"%s\" per verificare la firma (forse gpgv non è " +"installato)" #: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" @@ -2003,7 +2015,7 @@ msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"Le seguenti firme non sono state verificate perch la chiave pubblica non " +"Le seguenti firme non sono state verificate perché la chiave pubblica non è " "disponibile:\n" #: methods/gzip.cc:64 @@ -2023,11 +2035,11 @@ msgstr "In attesa degli header" #: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" -msgstr "Si ottenuto una singola linea di header su %u caratteri" +msgstr "Ricevuta una singola riga header su %u caratteri" #: methods/http.cc:531 msgid "Bad header line" -msgstr "Linea nell'header non corretta" +msgstr "Riga header non corretta" #: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" @@ -2035,15 +2047,15 @@ msgstr "Il server HTTP ha inviato un header di risposta non valido" #: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Il server HTTP ha inviato un Content-Length non valido" +msgstr "Il server HTTP ha inviato un header Content-Length non valido" #: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Il server HTTP ha inviato un Content-Range non valido" +msgstr "Il server HTTP ha inviato un header Content-Range non valido" #: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Questo server HTTP ha il supporto del range bacato" +msgstr "Questo server HTTP ha un supporto del range non corretto" #: methods/http.cc:627 msgid "Unknown date format" @@ -2051,44 +2063,43 @@ msgstr "Formato della data sconosciuto" #: methods/http.cc:774 msgid "Select failed" -msgstr "Select fallito" +msgstr "Select non riuscita" #: methods/http.cc:779 msgid "Connection timed out" -msgstr "Tempo limite per la connessione esaurito" +msgstr "Connessione terminata" #: methods/http.cc:802 msgid "Error writing to output file" -msgstr "Errore nella scrittura del file di output" +msgstr "Errore nello scrivere sul file di output" #: methods/http.cc:833 msgid "Error writing to file" -msgstr "Errore nella scrittura nel file" +msgstr "Errore nello scrivere su file" #: methods/http.cc:861 msgid "Error writing to the file" -msgstr "Errore nella scrittura nel file" +msgstr "Errore nello scrivere sul file" #: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" -msgstr "" -"Errore nella lettura dal server. Il lato remoto ha chiuso la connessione" +msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" #: methods/http.cc:877 msgid "Error reading from server" -msgstr "Errore nella lettura dal server" +msgstr "Errore nel leggere dal server" #: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" -msgstr "Impossibile troncare il file" +msgstr "Troncamento del file non riuscito" #: methods/http.cc:1105 msgid "Bad header data" -msgstr "Header dei dati malformato" +msgstr "Header dati non corretto" #: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" -msgstr "Connessione fallita" +msgstr "Connessione non riuscita" #: methods/http.cc:1229 msgid "Internal error" @@ -2109,6 +2120,8 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il " +"valore attuale è: %lu (man 5 apt.conf)." #: apt-pkg/contrib/strutl.cc:1014 #, c-format @@ -2118,49 +2131,49 @@ msgstr "Selezione %s non trovata" #: apt-pkg/contrib/configuration.cc:439 #, c-format msgid "Unrecognized type abbreviation: '%c'" -msgstr "Tipo di abbreviazione non riconosciuto: '%c'" +msgstr "Tipo di abbreviazione non riconosciuto: \"%c\"" #: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "Apertura del file di configurazione %s in corso" +msgstr "Apertura file di configurazione %s" #: apt-pkg/contrib/configuration.cc:662 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Errore di sintassi %s:%u: Il blocco inizia senza nome" +msgstr "Errore di sintassi %s:%u: il blocco inizia senza nome" #: apt-pkg/contrib/configuration.cc:681 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Errore di sintassi %s:%u: Tag malformato" +msgstr "Errore di sintassi %s:%u: tag non corretto" #: apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Errore di sintassi %s:%u: Carattere extra dopo il valore" +msgstr "Errore di sintassi %s:%u: caratteri extra dopo il valore" #: apt-pkg/contrib/configuration.cc:738 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -"Errore di sintassi %s:%u: Le direttive possono essere fatte solo al livello " -"pi alto" +"Errore di sintassi %s:%u: le direttive possono essere fatte solo al livello " +"più alto" #: apt-pkg/contrib/configuration.cc:745 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Errore di sintassi %s:%u: Troppi include annidati" +msgstr "Errore di sintassi %s:%u: troppe inclusioni annidate" #: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Errore di sintassi %s:%u: Incluso da qui" +msgstr "Errore di sintassi %s:%u: incluso da qui" #: apt-pkg/contrib/configuration.cc:758 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Errore di sintassi %s:%u: Direttiva non supportata '%s'" +msgstr "Errore di sintassi %s:%u: direttiva \"%s\" non supportata" #: apt-pkg/contrib/configuration.cc:809 #, c-format @@ -2170,7 +2183,7 @@ msgstr "Errore di sintassi %s:%u: caratteri extra alla fine del file" #: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... Errore!" +msgstr "%c%s... Errore." #: apt-pkg/contrib/progress.cc:155 #, c-format @@ -2180,18 +2193,18 @@ msgstr "%c%s... Fatto" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "L'opzione da linea di comando '%c' [da %s] sconosciuta." +msgstr "Opzione a riga di comando \"%c\" [da %s] sconosciuta." #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" -msgstr "L'opzione da linea di comando %s non chiara" +msgstr "Opzione a riga di comando %s non comprensibile" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "L'opzione da linea di comando %s, non booleana" +msgstr "Opzione a riga di comando %s non booleana" #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format @@ -2202,68 +2215,68 @@ msgstr "L'opzione %s richiede un argomento." #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "" -"Opzione %s: la specifica di configurazione del parametro deve avere un " +"Opzione %s: la specifica di configurazione dell'oggetto deve avere un " "=." #: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "L'opzione %s richiede un argomento intero, non '%s'" +msgstr "L'opzione %s richiede un argomento intero, non \"%s\"" #: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "L'opzione '%s' troppo lunga" +msgstr "Opzione \"%s\" troppo lunga" #: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "Il valore %s non chiaro, provare true o false." +msgstr "Il valore %s non è comprensibile, provare \"true\" o \"false\"." #: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "Operazione non valida %s" +msgstr "Operazione %s non valida" #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Impossibile accedere al mount point %s" +msgstr "Impossibile eseguire stat sul punto di mount %s" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 #: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" -msgstr "Impossibile raggiungere %s" +msgstr "Impossibile passare a %s" #: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Impossibile accedere al cdrom" +msgstr "Esecuzione di stat sul CD-ROM non riuscita" #: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Locking disabilitato per il file di lock in sola lettura %s" +msgstr "Blocco disabilitato per il file di blocco in sola lettura %s" #: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Impossibile aprire il file di lock %s" +msgstr "Impossibile aprire il file di blocco %s" #: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Lock disabilitato per il file di lock %s nfs montato" +msgstr "Blocco disabilitato per il file di blocco %s montato via nfs" #: apt-pkg/contrib/fileutl.cc:176 #, c-format msgid "Could not get lock %s" -msgstr "Impossibile ottenere il lock %s" +msgstr "Impossibile impostare il blocco %s" #: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "In attesa per %s ma non presente" +msgstr "In attesa di %s ma non era presente" #: apt-pkg/contrib/fileutl.cc:454 #, c-format @@ -2273,12 +2286,12 @@ msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." #: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Il sottoprocesso %s ha ritornato un codice d'errore (%u)" +msgstr "Il sottoprocesso %s ha restituito un codice d'errore (%u)" #: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Il sottoprocesso %s uscito inaspettatamente" +msgstr "Il sottoprocesso %s è uscito inaspettatamente" #: apt-pkg/contrib/fileutl.cc:503 #, c-format @@ -2288,24 +2301,24 @@ msgstr "Impossibile aprire il file %s" #: apt-pkg/contrib/fileutl.cc:559 #, c-format msgid "read, still have %lu to read but none left" -msgstr "letto, c'erano ancora %lu da leggere ma non e' stato lasciato nulla" +msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno" #: apt-pkg/contrib/fileutl.cc:589 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "scrittura, c'erano ancora %lu da scrivere ma non era possibile" +msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile" #: apt-pkg/contrib/fileutl.cc:664 msgid "Problem closing the file" -msgstr "Si verificato un problema chiudendo il file" +msgstr "Si è verificato un problema nel chiudere il file" #: apt-pkg/contrib/fileutl.cc:670 msgid "Problem unlinking the file" -msgstr "Si verificato un problema rimuovendo il file" +msgstr "Si è verificato un problema nell'eseguire l'unlink del file" #: apt-pkg/contrib/fileutl.cc:681 msgid "Problem syncing the file" -msgstr "Si verificato un problema sincronizzando il file" +msgstr "Si è verificato un problema nel sincronizzare il file" #: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" @@ -2313,21 +2326,21 @@ msgstr "Cache dei pacchetti vuota" #: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Il file cache dei pacchetti corrotto" +msgstr "Il file della cache dei pacchetti è danneggiato" #: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Il file cache dei pacchetti in una versione incompatibile" +msgstr "La versione del file della cache dei pacchetti è incompatibile" #: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Questo APT non supporta il sistema di versioning '%s'" +msgstr "Questo APT non supporta il sistema di versione \"%s\"" #: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" msgstr "" -"Il file cache dei pacchetti stato generato per un'architettura differente" +"Il file della cache dei pacchetti è stato generato per un'altra architettura" #: apt-pkg/pkgcache.cc:224 msgid "Depends" @@ -2383,7 +2396,7 @@ msgstr "extra" #: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 msgid "Building dependency tree" -msgstr "Generazione dell'albero delle dipendenze in corso" +msgstr "Generazione albero delle dipendenze" #: apt-pkg/depcache.cc:122 msgid "Candidate versions" @@ -2400,72 +2413,72 @@ msgstr "Lettura informazioni sullo stato" #: apt-pkg/depcache.cc:219 #, c-format msgid "Failed to open StateFile %s" -msgstr "Impossibile aprire il file di stato (StateFile) %s" +msgstr "Apertura del file di stato %s non riuscita" #: apt-pkg/depcache.cc:225 #, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Impossibile scrivere il file temporaneo di stato (StateFile) %s" +msgstr "Scrittura del file temporaneo di stato %s non riuscita" #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Impossibile analizzare il file dei pacchetti %s (1)" +msgstr "Impossibile analizzare il file di pacchetto %s (1)" #: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Impossibile analizzare il file dei pacchetti %s (2)" +msgstr "Impossibile analizzare il file di pacchetto %s (2)" #: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "La linea %lu in %s (URI) non corretta" +msgstr "La riga %lu nel file %s non è corretta (URI)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "La linea %lu in %s (dist) non corretta" +msgstr "La riga %lu nel file %s non è corretta (dist)" #: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "La linea %lu in %s (URI parse) non corretta" +msgstr "La riga %lu nel file %s non è corretta (URI parse)" #: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "La linea %lu nella lista delle fonti %s (Absolute dist) non corretta" +msgstr "La riga %lu nel file %s non è corretta (absolute dist)" #: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "La linea %lu in %s (dist parse) non corretta" +msgstr "La riga %lu nel file %s non è corretta (dist parse)" #: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" -msgstr "Apertura di %s in corso" +msgstr "Apertura di %s" #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." -msgstr "Linea %u troppo lunga nel source list %s." +msgstr "Riga %u troppo lunga nel file %s." #: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "La linea %u in %s (type) non corretta" +msgstr "La riga %u nel file %s non è corretta (type)" #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Il tipo '%s' non riconosciuto alla linea %u nella lista sorgenti %s" +msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "La linea %u in %s (vendor id) non corretta" +msgstr "La riga %u nel file %s non è corretta (vendor id)" #: apt-pkg/packagemanager.cc:428 #, c-format @@ -2474,42 +2487,44 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"Quest'installazione necessita della rimozione temporanea del pacchetto " -"essenziale %s a causa di un loop Conflitto/Pre-Dipendenza. Questo non " -"bene, ma se si vuole farlo, si attivi l'opzione APT::Force-LoopBreak " +"L'installazione necessita della rimozione temporanea del pacchetto " +"essenziale %s a causa di un ciclo conflitto/pre-dipendenza. Questa è una " +"situazione critica, ma se si vuole realmente procedere, attivare l'opzione " +"APT::Force-LoopBreak." #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -msgstr "Il file indice di tipo '%s' non supportato" +msgstr "Il file indice di tipo \"%s\" non è supportato" #: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Il pacchetto %s deve essere reinstallato, ma non si riesce a trovare un " -"archivio per esso." +"Il pacchetto %s deve essere reinstallato, ma non è possibile trovarne un " +"archivio." #: apt-pkg/algorithms.cc:1107 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Errore, pkgProblemResolver::Resolve ha generato uno stop, questo pu essere " -"causato da pacchetti bloccati " +"Errore, pkgProblemResolver::Resolve ha generato delle interruzioni. Questo " +"potrebbe essere causato da pacchetti bloccati." #: apt-pkg/algorithms.cc:1109 msgid "Unable to correct problems, you have held broken packages." -msgstr "Impossibile correggere i problemi, ci sono pacchetti rotti bloccati" +msgstr "" +"Impossibile correggere i problemi, ci sono pacchetti danneggiati bloccati." #: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure " -"si useranno quelli precedenti." +"Impossibile scaricare alcuni file di indice: saranno ignorati o verranno " +"usati quelli vecchi." #: apt-pkg/acquire.cc:59 #, c-format @@ -2536,24 +2551,22 @@ msgstr "Scaricamento file %li di %li" #: apt-pkg/acquire-worker.cc:110 #, c-format msgid "The method driver %s could not be found." -msgstr "Non stato possibile trovare un driver per il metodo %s." +msgstr "Impossibile trovare un driver per il metodo %s." #: apt-pkg/acquire-worker.cc:159 #, c-format msgid "Method %s did not start correctly" -msgstr "Il metodo %s non partito correttamente" +msgstr "Il metodo %s non si è avviato correttamente" #: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere " -"invio." +msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio." #: apt-pkg/init.cc:124 #, c-format msgid "Packaging system '%s' is not supported" -msgstr "Il sistema di archiviazione (packaging) '%s' non supportato" +msgstr "Il sistema di pacchetti \"%s\" non è supportato" #: apt-pkg/init.cc:140 msgid "Unable to determine a suitable packaging system type" @@ -2562,153 +2575,151 @@ msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" #: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." -msgstr "Impossibile analizzare %s." +msgstr "Impossibile eseguire stat su %s." #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Bisogna inserire alcuni URI di tipo 'source' in sources.list" +msgstr "" +"È necessario inserire alcuni URI di tipo \"source\" nel file sources.list" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"La lista dei pacchetti o il file di status non possono essere letti o aperti." +"L'elenco dei pacchetti o il file di stato non può essere letto o aperto." #: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr " consigliabile eseguire apt-get update per correggere questi problemi" +msgstr "" +"È consigliato eseguire \"apt-get update\" per correggere questi problemi" #: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Campo non valido nel file delle preferenze, Manca \"Package header\"" +msgstr "Campo non valido nel file delle preferenze: manca l'header \"Package\"" #: apt-pkg/policy.cc:289 #, c-format msgid "Did not understand pin type %s" -msgstr "Impossibile capire il tipo di pin %s" +msgstr "Impossibile capire il tipo di gancio %s" #: apt-pkg/policy.cc:297 msgid "No priority (or zero) specified for pin" -msgstr "Nessuna (o zero) priorit specificata per il pin" +msgstr "Priorità per il gancio non specificata (o zero)" #: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "La cache ha un sistema incompatibile di gestione delle versioni" +msgstr "La cache ha un sistema di gestione delle versioni incompatibile" #: apt-pkg/pkgcachegen.cc:115 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Errore nell'analisi di %s (NewPackage)" +msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:130 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Errore nell'analisi di %s (UsePackage1)" +msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:164 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "Errore nell'analisi di %s (NewFileDesc1)" +msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:189 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Errore nell'analisi di %s (UsePackage2)" +msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:193 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Errore nell'analisi di %s (NewFileVer1)" +msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:224 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Errore nell'analisi di %s (NewVersion1)" +msgstr "Si è verificato un errore nell'elaborare %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:228 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Errore nell'analisi di %s (UsePackage3)" +msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:232 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Errore nell'analisi di %s (NewVersion2)" +msgstr "Si è verificato un errore nell'elaborare %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:256 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Errore nell'analisi di %s (NewFileDesc2)" +msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"WOW, si ecceduto il numero massimo di nomi di pacchetti che questo APT " -"capace di gestire" +"È stato superato il numero di nomi di pacchetti che questo APT può gestire." #: apt-pkg/pkgcachegen.cc:265 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"WOW, si ecceduto il numero massimo di versioni che questo APT capace di " -"gestire" +msgstr "È stato superato il numero di versioni che questo APT può gestire." #: apt-pkg/pkgcachegen.cc:268 msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "" -"WOW, si superato il numero massimo di descrizioni che questo APT capace " -"di gestire" +msgstr "È stato superato il numero di descrizioni che questo APT può gestire." #: apt-pkg/pkgcachegen.cc:271 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"WOW, si ecceduto il numero massimo di dipendenze che questo APT capace " -"di gestire" +msgstr "È stato superato il numero di dipendenze che questo APT può gestire." #: apt-pkg/pkgcachegen.cc:299 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Errore nell'analisi di %s (FindPkg)" +msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:312 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Errore nell'analisi di %s (CollectFileProvides)" +msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)" +# (ndt) il primo è il nome del pacchetto, il secondo la versione #: apt-pkg/pkgcachegen.cc:318 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -" stato impossibile trovare %s %s mentre si processava le dipendenze dei file" +"Il pacchetto %s v.%s non è stato trovato durante l'elaborazione delle " +"dipendenze" #: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Impossibile controllare la lista dei pacchetti sorgente %s" +msgstr "Impossibile eseguire stat sull'elenco dei pacchetti sorgente %s" +# (ndt) non mi convince per niente, ma vediamo cosa salta fuori #: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" -msgstr "Il File Collezionato Fornisce" +msgstr "Il file fornisce" #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "Errore di I/O nel salvataggio del cache sorgente" +msgstr "Errore di I/O nel salvare la cache sorgente" #: apt-pkg/acquire-item.cc:127 #, c-format msgid "rename failed, %s (%s -> %s)." -msgstr "rename() fallita: %s (%s -> %s)." +msgstr "rename() non riuscita: %s (%s -> %s)." #: apt-pkg/acquire-item.cc:401 msgid "MD5Sum mismatch" -msgstr "Somma MD5 non corrispondente" +msgstr "MD5sum non corrispondente" #: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 msgid "Hash Sum mismatch" -msgstr "Somma Hash non corrispondente" +msgstr "Somma hash non corrispondente" #: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" msgstr "" -"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n" +"Non è disponibile alcuna chiave pubblica per i seguenti ID di chiavi:\n" #: apt-pkg/acquire-item.cc:1231 #, c-format @@ -2716,9 +2727,8 @@ msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Non stato possibile trovare un file per il pacchetto %s. Questo significa " -"che bisogna correggere manualmente l'errore. (a causa di un'architettura " -"mancante)" +"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " +"sistemare manualmente questo pacchetto (a causa dell'architettura mancante)." #: apt-pkg/acquire-item.cc:1290 #, c-format @@ -2726,25 +2736,25 @@ msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Non stato possibile trovare file per il pacchetto %s. Questo significa che " -"bisogna correggere manualmente l'errore." +"Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario " +"sistemare manualmente questo pacchetto." #: apt-pkg/acquire-item.cc:1331 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -"I file indice dei pacchetti sono corrotti. Non c' un campo Filename: per il " +"L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il " "pacchetto %s." #: apt-pkg/acquire-item.cc:1418 msgid "Size mismatch" -msgstr "Le Dimensioni non corrispondono" +msgstr "Le dimensioni non corrispondono" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Il blocco vendor %s non contiene dati" +msgstr "Il blocco vendor %s non contiene impronte" #: apt-pkg/cdrom.cc:529 #, c-format @@ -2752,30 +2762,30 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Si user il punto di montaggio del CD-ROM %s\n" +"Viene usato il punto di mount del CD-ROM %s\n" "Montaggio CD-ROM\n" #: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 msgid "Identifying.. " -msgstr "Identificazione in corso.. " +msgstr "Identificazione... " #: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s\n" -msgstr "Etichette salvate: %s \n" +msgstr "Etichette archiviate: %s \n" #: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 msgid "Unmounting CD-ROM...\n" -msgstr "Smontaggio CD-ROM in corso...\n" +msgstr "Smontaggio CD-ROM...\n" #: apt-pkg/cdrom.cc:590 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Si user il mount point del CD-ROM %s\n" +msgstr "Viene usato il punto di mount del CD-ROM %s\n" #: apt-pkg/cdrom.cc:608 msgid "Unmounting CD-ROM\n" -msgstr "Smontaggio CD-ROM in corso\n" +msgstr "Smontaggio CD-ROM\n" #: apt-pkg/cdrom.cc:612 msgid "Waiting for disc...\n" @@ -2784,11 +2794,11 @@ msgstr "In attesa del disco...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:620 msgid "Mounting CD-ROM...\n" -msgstr "Montaggio CD-ROM in corso \n" +msgstr "Montaggio CD-ROM...\n" #: apt-pkg/cdrom.cc:638 msgid "Scanning disc for index files..\n" -msgstr "Scansione del disco alla ricerca di file indice, in corso..\n" +msgstr "Analisi del disco per file indice...\n" #: apt-pkg/cdrom.cc:678 #, c-format @@ -2802,11 +2812,11 @@ msgstr "" #: apt-pkg/cdrom.cc:715 #, c-format msgid "Found label '%s'\n" -msgstr "Etichetta trovata \"%s\"\n" +msgstr "Trovata l'etichetta \"%s\"\n" #: apt-pkg/cdrom.cc:744 msgid "That is not a valid name, try again.\n" -msgstr "Questo non un nome valido, riprovare.\n" +msgstr "Questo non è un nome valido, riprovare.\n" #: apt-pkg/cdrom.cc:760 #, c-format @@ -2814,20 +2824,20 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Questo disco chiamato: \n" -"'%s'\n" +"Questo disco è chiamato: \n" +"\"%s\"\n" #: apt-pkg/cdrom.cc:764 msgid "Copying package lists..." -msgstr "Copia della lista dei pacchetti in corso..." +msgstr "Copia elenco pacchetti..." #: apt-pkg/cdrom.cc:790 msgid "Writing new source list\n" -msgstr "Scrittura di una nuova lista sorgenti in corso\n" +msgstr "Scrittura nuovo elenco sorgenti\n" #: apt-pkg/cdrom.cc:799 msgid "Source list entries for this disc are:\n" -msgstr "Le voci lista sorgenti per questo Disco sono:\n" +msgstr "Le voci dell'elenco sorgenti per questo disco sono:\n" #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 #, c-format @@ -2842,52 +2852,53 @@ msgstr "Scritti %i record con %i file mancanti.\n" #: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "Scritti %i record con %i file senza match\n" +msgstr "Scritti %i record con %i file senza corrispondenze\n" #: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "Scritti %i record con %i file mancanti e %i file senza match\n" +msgstr "" +"Scritti %i record con %i file mancanti e %i file senza corrispondenze\n" #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" -msgstr "Installazione di %s in corso" +msgstr "Installazione di %s" #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 #, c-format msgid "Configuring %s" -msgstr "Configurazione di %s in corso" +msgstr "Configurazione di %s" #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 #, c-format msgid "Removing %s" -msgstr "Rimozione di %s in corso" +msgstr "Rimozione di %s" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Running post-installation trigger %s" -msgstr "Esecuzione del comando post installazione %s" +msgstr "Esecuzione comando di post installazione %s" #: apt-pkg/deb/dpkgpm.cc:521 #, c-format msgid "Directory '%s' missing" -msgstr "Manca la directory '%s'" +msgstr "Directory \"%s\" mancante" #: apt-pkg/deb/dpkgpm.cc:605 #, c-format msgid "Preparing %s" -msgstr "Preparazione di %s in corso" +msgstr "Preparazione di %s" #: apt-pkg/deb/dpkgpm.cc:606 #, c-format msgid "Unpacking %s" -msgstr "Scompattamento di %s in corso" +msgstr "Estrazione di %s" #: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "Preparazione alla configurazione di %s in corso" +msgstr "Preparazione alla configurazione di %s" #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format @@ -2897,95 +2908,39 @@ msgstr "Elaborazione opzioni addizionali per %s" #: apt-pkg/deb/dpkgpm.cc:617 #, c-format msgid "Installed %s" -msgstr "%s Installato" +msgstr "Pacchetto %s installato" #: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624 #: apt-pkg/deb/dpkgpm.cc:625 #, c-format msgid "Preparing for removal of %s" -msgstr "Preparazione per la rimozione di %s in corso" +msgstr "Preparazione alla rimozione di %s" #: apt-pkg/deb/dpkgpm.cc:628 #, c-format msgid "Removed %s" -msgstr "%s rimosso" +msgstr "Pacchetto %s rimosso" #: apt-pkg/deb/dpkgpm.cc:633 #, c-format msgid "Preparing to completely remove %s" -msgstr "Preparazione alla rimozione totale di %s in corso" +msgstr "Preparazione alla rimozione completa di %s" #: apt-pkg/deb/dpkgpm.cc:634 #, c-format msgid "Completely removed %s" -msgstr "Rimozione totale completata %s" +msgstr "Pacchetto %s rimosso completamente" #: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "Impossibile scrivere un log, openpty() fallito (/dev/pts montato?)\n" +msgstr "" +"Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non " +"è montato)\n" #: methods/rred.cc:219 msgid "Could not patch file" -msgstr "Impossibile aprire il file %s" +msgstr "Impossibile applicare la patch al file" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" - -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "MMap dinamica ha finito lo spazio" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Poiché Ú stata richiesta solo una singola operazione Ú molto facile " -#~ "che\n" -#~ "il pacchetto semplicemente non sia installabile, si consiglia\n" -#~ "di inviare un \"bug report\" per tale pacchetto." - -#, fuzzy -#~ msgid "Line %d too long (max %lu)" -#~ msgstr "Linea %d troppo lunga (max %d)" - -#, fuzzy -#~ msgid "Line %d too long (max %d)" -#~ msgstr "Linea %d troppo lunga (max %d)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc1)" -#~ msgstr "Errore nell'analisi di %s (NewFileVer1)" - -#, fuzzy -#~ msgid "Error occured while processing %s (NewFileDesc2)" -#~ msgstr "Errore nell'analisi di %s (NewFileVer1)" - -#, fuzzy -#~ msgid "Stored label: %s \n" -#~ msgstr "Etichette salvate: %s \n" - -#, fuzzy -#~ msgid "" -#~ "Found %i package indexes, %i source indexes, %i translation indexes and %" -#~ "i signatures\n" -#~ msgstr "Trovati %i indici di pacchetto, %i indici di sorgenti e %i firme\n" - -#, fuzzy -#~ msgid "openpty failed\n" -#~ msgstr "Select fallito" - -#~ msgid "File date has changed %s" -#~ msgstr "La data del file Ú cambiata %s" - -#~ msgid "Reading file list" -#~ msgstr "Lettura della lista dei file in corso" - -#~ msgid "Could not execute " -#~ msgstr "Impossibile eseguire " - -#~ msgid "Preparing for remove with config %s" -#~ msgstr "Preparazione per la rimozione con la configurazione %s in corso" - -#~ msgid "Removed with config %s" -#~ msgstr "Rimosso con la configurazione %s" -- cgit v1.2.3-70-g09d2 From 7704f93346f55878348de8ce58d5ee5443a4d14d Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 8 Apr 2009 19:52:19 +0200 Subject: Slovak translation update --- debian/changelog | 1 + po/sk.po | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b63fcaeab..94abad0bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - sv.po. Closes: #518070 - sk.po. Closes: #520403 - it.po. Closes: #522222 + - sk.po. Closes: #520403 -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 diff --git a/po/sk.po b/po/sk.po index 79c7b4222..c6073b22d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-03-19 12:06+0100\n" +"PO-Revision-Date: 2009-04-08 16:08+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -307,7 +307,7 @@ msgstr "" "a šablón z balíkov Debian\n" "\n" "Voľby:\n" -" -h Tento pomocnék.\n" +" -h Tento pomocník.\n" " -t Nastaví dočasný adresár\n" " -c=? Načíta tento konfiguračný súbor\n" " -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n" @@ -496,7 +496,7 @@ msgstr "E: Chyby sa týkajú súboru " #: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Chyba pri prklade %s" +msgstr "Chyba pri preklade %s" #: ftparchive/writer.cc:170 msgid "Tree walking failed" @@ -602,7 +602,7 @@ msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu" #: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Zlyhalo vytvorenie medziprocesovej rúry k podprocesu" +msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu" #: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" @@ -1213,7 +1213,7 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%s závislosť pre %s sa nedá splniť, protože sa nedá nájsť verzia balíka %s, " +"%s závislosť pre %s sa nedá splniť, pretože sa nedá nájsť verzia balíka %s, " "ktorá zodpovedá požiadavke na verziu" #: cmdline/apt-get.cc:2503 @@ -1443,7 +1443,7 @@ msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Neznáma hlavička TARu typ %u, člen %s" +msgstr "Neznáma TAR hlavička typu %u, člen %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" @@ -1471,7 +1471,7 @@ msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Hashovací prvok sa nedá nájsť!" +msgstr "Hašovací prvok sa nedá nájsť!" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" @@ -1537,7 +1537,7 @@ msgstr "Adresár %s sa nahradí neadresárom" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Nedá sa nájsť uzol v jeho hashovacej oblasti" +msgstr "Nedá sa nájsť uzol na adrese jeho hašu" #: apt-inst/extract.cc:284 msgid "The path is too long" @@ -1693,14 +1693,14 @@ msgstr "Nespracovateľný riadiaci súbor" #: methods/cdrom.cc:114 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Nedá sa čítať databáza na cdrom %s" +msgstr "Nedá sa čítať databáza na CD-ROM %s" #: methods/cdrom.cc:123 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"Pre pridanie CD do APT použijte apt-cdrom. apt-get update sa nedá využiť na " +"Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na " "pridávanie nových CD." #: methods/cdrom.cc:131 @@ -2079,7 +2079,9 @@ msgstr "Nedá sa urobiť mmap %lu bajtov" msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" -msgstr "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)" +msgstr "" +"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-" +"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)" #: apt-pkg/contrib/strutl.cc:1014 #, c-format @@ -2206,7 +2208,7 @@ msgstr "Nedá sa prejsť do %s" #: apt-pkg/contrib/cdromutl.cc:188 msgid "Failed to stat the cdrom" -msgstr "Nedá sa vyhodnotiť cdrom" +msgstr "Nedá sa vykonať stat() CD-ROM" #: apt-pkg/contrib/fileutl.cc:149 #, c-format -- cgit v1.2.3-70-g09d2 From a7c526b6288aa21b64be5991a3f406fd9509db05 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Apr 2009 22:37:40 +0200 Subject: apt.cron.daily: catch invalid dates due to DST time changes in the stamp files --- debian/apt.cron.daily | 21 +++++++++++++++++++-- debian/changelog | 6 +++++- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 32fbafc57..5c5ca88c7 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -50,8 +50,25 @@ check_stamp() fi # compare midnight today to midnight the day the stamp was updated - stamp=$(date --date=$(date -r $stamp --iso-8601) +%s) - now=$(date --date=$(date --iso-8601) +%s) + stamp_file="$stamp" + stamp=$(date --date=$(date -r $stamp_file --iso-8601) +%s 2>/dev/null) + if [ "$?" != "0" ]; then + # Due to some timezones returning 'invalid date' for midnight on + # certain dates (eg America/Sao_Paulo), if date returns with error + # remove the stamp file and return 0. See coreutils bug: + # http://lists.gnu.org/archive/html/bug-coreutils/2007-09/msg00176.html + rm -f "$stamp_file" + return 0 + fi + + now=$(date --date=$(date --iso-8601) +%s 2>/dev/null) + if [ "$?" != "0" ]; then + # As above, due to some timezones returning 'invalid date' for midnight + # on certain dates (eg America/Sao_Paulo), if date returns with error + # return 0. + return 0 + fi + delta=$(($now-$stamp)) # intervall is in days, diff --git a/debian/changelog b/debian/changelog index 94abad0bf..2b84d16a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,12 @@ apt (0.7.20.3) UNRELEASED; urgency=low - sk.po. Closes: #520403 - it.po. Closes: #522222 - sk.po. Closes: #520403 + + [ Jamie Strandboge ] + * apt.cron.daily: catch invalid dates due to DST time changes + in the stamp files - -- Michael Vogt Sun, 08 Feb 2009 11:47:48 +0100 + -- Michael Vogt Wed, 08 Apr 2009 22:37:01 +0200 apt (0.7.20.2) unstable; urgency=medium -- cgit v1.2.3-70-g09d2 From a06f61bbb328ee218afbd367248f6f2338186e19 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Apr 2009 22:49:23 +0200 Subject: * methods/gpgv.cc: - properly check for expired and revoked keys (closes: #433091) --- debian/changelog | 4 ++++ methods/gpgv.cc | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2b84d16a6..5ddd98a0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ apt (0.7.20.3) UNRELEASED; urgency=low * apt.cron.daily: catch invalid dates due to DST time changes in the stamp files + [ Michael Vogt ] + * methods/gpgv.cc: + - properly check for expired and revoked keys (closes: #433091) + -- Michael Vogt Wed, 08 Apr 2009 22:37:01 +0200 apt (0.7.20.2) unstable; urgency=medium diff --git a/methods/gpgv.cc b/methods/gpgv.cc index 9f4683e6e..470b47fd4 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -17,13 +17,18 @@ #define GNUPGBADSIG "[GNUPG:] BADSIG" #define GNUPGNOPUBKEY "[GNUPG:] NO_PUBKEY" #define GNUPGVALIDSIG "[GNUPG:] VALIDSIG" +#define GNUPGGOODSIG "[GNUPG:] GOODSIG" +#define GNUPGKEYEXPIRED "[GNUPG:] KEYEXPIRED" +#define GNUPGREVKEYSIG "[GNUPG:] REVKEYSIG" #define GNUPGNODATA "[GNUPG:] NODATA" class GPGVMethod : public pkgAcqMethod { private: string VerifyGetSigners(const char *file, const char *outfile, - vector &GoodSigners, vector &BadSigners, + vector &GoodSigners, + vector &BadSigners, + vector &WorthlessSigners, vector &NoPubKeySigners); protected: @@ -37,6 +42,7 @@ class GPGVMethod : public pkgAcqMethod string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector &GoodSigners, vector &BadSigners, + vector &WorthlessSigners, vector &NoPubKeySigners) { // setup a (empty) stringstream for formating the return value @@ -179,15 +185,27 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Got NODATA! " << std::endl; BadSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); } - if (strncmp(buffer, GNUPGVALIDSIG, sizeof(GNUPGVALIDSIG)-1) == 0) + if (strncmp(buffer, GNUPGKEYEXPIRED, sizeof(GNUPGKEYEXPIRED)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got KEYEXPIRED! " << std::endl; + WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } + if (strncmp(buffer, GNUPGREVKEYSIG, sizeof(GNUPGREVKEYSIG)-1) == 0) + { + if (_config->FindB("Debug::Acquire::gpgv", false)) + std::cerr << "Got REVKEYSIG! " << std::endl; + WorthlessSigners.push_back(string(buffer+sizeof(GNUPGPREFIX))); + } + if (strncmp(buffer, GNUPGGOODSIG, sizeof(GNUPGGOODSIG)-1) == 0) { char *sig = buffer + sizeof(GNUPGPREFIX); - char *p = sig + sizeof("VALIDSIG"); + char *p = sig + sizeof("GOODSIG"); while (*p && isxdigit(*p)) p++; *p = 0; if (_config->FindB("Debug::Acquire::gpgv", false)) - std::cerr << "Got VALIDSIG, key ID:" << sig << std::endl; + std::cerr << "Got GOODSIG, key ID:" << sig << std::endl; GoodSigners.push_back(string(sig)); } } @@ -227,6 +245,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) string keyID; vector GoodSigners; vector BadSigners; + // a worthless signature is a expired or revoked one + vector WorthlessSigners; vector NoPubKeySigners; FetchResult Res; @@ -235,13 +255,14 @@ bool GPGVMethod::Fetch(FetchItem *Itm) // Run gpgv on file, extract contents and get the key ID of the signer string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), - GoodSigners, BadSigners, NoPubKeySigners); + GoodSigners, BadSigners, WorthlessSigners, + NoPubKeySigners); if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty()) { string errmsg; // In this case, something bad probably happened, so we just go // with what the other method gave us for an error message. - if (BadSigners.empty() && NoPubKeySigners.empty()) + if (BadSigners.empty() && WorthlessSigners.empty() && NoPubKeySigners.empty()) errmsg = msg; else { @@ -252,6 +273,13 @@ bool GPGVMethod::Fetch(FetchItem *Itm) I != BadSigners.end(); I++) errmsg += (*I + "\n"); } + if (!WorthlessSigners.empty()) + { + errmsg += _("The following signatures were invalid:\n"); + for (vector::iterator I = WorthlessSigners.begin(); + I != WorthlessSigners.end(); I++) + errmsg += (*I + "\n"); + } if (!NoPubKeySigners.empty()) { errmsg += _("The following signatures couldn't be verified because the public key is not available:\n"); -- cgit v1.2.3-70-g09d2 From 09fab2442c2ab9a503841d3dcd56b3c0c3efb502 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 9 Apr 2009 04:36:34 +0200 Subject: * apt-pkg/contrib/strutl.cc: - fix TimeToStr i18n (LP: #289807) * [ABI break] merge support for http redirects, thanks to Jeff Licquia and Anthony Towns * [ABI break] use int for the package IDs (thanks to Steve Cotton) * apt-pkg/pkgcache.cc: - do not run "dpkg --configure pkg" if pkg is in trigger-awaited state (LP: #322955) * methods/https.cc: - add Acquire::https::AllowRedirect support * Clarify the --help for 'purge' (LP: #243948) * cmdline/apt-get.cc - fix "apt-get source pkg" if there is a binary package and a source package of the same name but from different packages (LP: #330103) * cmdline/acqprogress.cc: - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). --- .bzr-builddeb/default.conf | 5 +++ .bzr-builddeb/default.conf.orig | 2 ++ apt-pkg/acquire-method.cc | 32 +++++++++++++++++ apt-pkg/acquire-method.h | 2 ++ apt-pkg/acquire-worker.cc | 14 ++++++++ apt-pkg/contrib/strutl.cc | 14 +++++--- apt-pkg/deb/debsystem.cc | 2 +- apt-pkg/deb/dpkgpm.cc | 4 +-- apt-pkg/makefile | 2 +- apt-pkg/pkgcache.cc | 8 +++-- apt-pkg/pkgcache.h | 8 ++--- cmdline/acqprogress.cc | 4 +-- cmdline/apt-get.cc | 25 +++++++------ debian/changelog | 20 +++++++++++ doc/examples/configure-index | 6 ++-- ftparchive/cachedb.cc | 1 + methods/http.cc | 78 ++++++++++++++++++++++++++++++++++++++++- methods/http.h | 3 ++ methods/https.cc | 6 +++- methods/makefile | 2 +- pre-build.sh | 3 ++ 21 files changed, 208 insertions(+), 33 deletions(-) create mode 100644 .bzr-builddeb/default.conf create mode 100644 .bzr-builddeb/default.conf.orig create mode 100755 pre-build.sh (limited to 'debian') diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 000000000..f2c082569 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,5 @@ +[BUILDDEB] +native = true + +[HOOKS] +pre-build=./pre-build.sh diff --git a/.bzr-builddeb/default.conf.orig b/.bzr-builddeb/default.conf.orig new file mode 100644 index 000000000..9c55498ce --- /dev/null +++ b/.bzr-builddeb/default.conf.orig @@ -0,0 +1,2 @@ +[BUILDDEB] +native = true diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index bc29417f7..acf1156dc 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -447,6 +447,38 @@ 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. */ +void pkgAcqMethod::Redirect(const string &NewURI) +{ + string CurrentURI = ""; + if (Queue != 0) + CurrentURI = Queue->Uri; + + char S[1024]; + snprintf(S, sizeof(S)-50, "103 Redirect\nURI: %s\nNew-URI: %s\n\n", + CurrentURI.c_str(), NewURI.c_str()); + + if (write(STDOUT_FILENO,S,strlen(S)) != (ssize_t)strlen(S)) + exit(100); + + // 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; +} + /*}}}*/ + // AcqMethod::FetchResult::FetchResult - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h index e02eab018..fab77e664 100644 --- a/apt-pkg/acquire-method.h +++ b/apt-pkg/acquire-method.h @@ -84,6 +84,8 @@ class pkgAcqMethod void Log(const char *Format,...); void Status(const char *Format,...); + void Redirect(const string &NewURI); + int Run(bool Single = false); inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;}; diff --git a/apt-pkg/acquire-worker.cc b/apt-pkg/acquire-worker.cc index 1a754dae9..78c68737c 100644 --- a/apt-pkg/acquire-worker.cc +++ b/apt-pkg/acquire-worker.cc @@ -220,6 +220,20 @@ bool pkgAcquire::Worker::RunMessages() Status = LookupTag(Message,"Message"); break; + // 103 Redirect + case 103: + { + if (Itm == 0) + { + _error->Error("Method gave invalid 103 Redirect message"); + break; + } + + string NewURI = LookupTag(Message,"New-URI",URI.c_str()); + Itm->URI = NewURI; + break; + } + // 200 URI Start case 200: { diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index bd374fd1e..a69cf01ec 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -331,23 +331,27 @@ string TimeToStr(unsigned long Sec) { if (Sec > 60*60*24) { - sprintf(S,"%lid %lih%limin%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); + //d means days, h means hours, min means minutes, s means seconds + sprintf(S,_("%lid %lih %limin %lis"),Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60*60) { - sprintf(S,"%lih%limin%lis",Sec/60/60,(Sec/60) % 60,Sec % 60); + //h means hours, min means minutes, s means seconds + sprintf(S,_("%lih %limin %lis"),Sec/60/60,(Sec/60) % 60,Sec % 60); break; } if (Sec > 60) { - sprintf(S,"%limin%lis",Sec/60,Sec % 60); + //min means minutes, s means seconds + sprintf(S,_("%limin %lis"),Sec/60,Sec % 60); break; } - - sprintf(S,"%lis",Sec); + + //s means seconds + sprintf(S,_("%lis"),Sec); break; } diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 11a84f1c6..baa98f546 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -96,7 +96,7 @@ bool debSystem::UnLock(bool NoErrors) return false; if (LockCount < 1) - return _error->Error("Not locked"); + return _error->Error(_("Not locked")); if (--LockCount == 0) { close(LockFD); diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 40aafafa4..85e54988e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -777,16 +777,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) sighandler_t old_SIGHUP = signal(SIGHUP,SIG_IGN); struct termios tt; - struct termios tt_out; struct winsize win; int master; int slave; // FIXME: setup sensible signal handling (*ick*) tcgetattr(0, &tt); - tcgetattr(1, &tt_out); ioctl(0, TIOCGWINSZ, (char *)&win); - if (openpty(&master, &slave, NULL, &tt_out, &win) < 0) + if (openpty(&master, &slave, NULL, &tt, &win) < 0) { const char *s = _("Can not write log, openpty() " "failed (/dev/pts not mounted?)\n"); diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 1b78c94f6..087f17740 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=4.6 +MAJOR=4.7 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 8eb62089a..4fbf42c4b 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -275,8 +275,12 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const if (Pkg->CurrentState == pkgCache::State::UnPacked || Pkg->CurrentState == pkgCache::State::HalfConfigured || - Pkg->CurrentState == pkgCache::State::TriggersPending || - Pkg->CurrentState == pkgCache::State::TriggersAwaited) + //we don't need to care for triggers awaiting packages + //dpkg will deal with them automatically when the + //trigger pending action is run (those packages are usually + //in half-configured or triggers-pending state) + //Pkg->CurrentState == pkgCache::State::TriggersAwaited + Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 59d5003bb..759e9a225 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -214,7 +214,7 @@ struct pkgCache::Package unsigned char InstState; // Flags unsigned char CurrentState; // State - unsigned short ID; + unsigned int ID; unsigned long Flags; }; @@ -235,7 +235,7 @@ struct pkgCache::PackageFile // Linked list map_ptrloc NextFile; // PackageFile - unsigned short ID; + unsigned int ID; time_t mtime; // Modification time for the file }; @@ -272,7 +272,7 @@ struct pkgCache::Version map_ptrloc Size; // These are the .deb size map_ptrloc InstalledSize; unsigned short Hash; - unsigned short ID; + unsigned int ID; unsigned char Priority; }; @@ -289,7 +289,7 @@ struct pkgCache::Description map_ptrloc NextDesc; // Description map_ptrloc ParentPkg; // Package - unsigned short ID; + unsigned int ID; }; struct pkgCache::Dependency diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index a5fee1db5..b3ded4142 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -145,11 +145,11 @@ void AcqTextStatus::Stop() bandwidth and ETA indicator. */ bool AcqTextStatus::Pulse(pkgAcquire *Owner) { + pkgAcquireStatus::Pulse(Owner); + if (Quiet > 0) return true; - pkgAcquireStatus::Pulse(Owner); - enum {Long = 0,Medium,Short} Mode = Long; char Buffer[sizeof(BlankLine)]; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a7221d47d..ccf53ed25 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1272,16 +1272,23 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, } } } - - // No source package name.. - if (Src.empty() == true) - Src = TmpSrc; - + // The best hit pkgSrcRecords::Parser *Last = 0; unsigned long Offset = 0; string Version; bool IsMatch = false; + bool MatchSrcOnly = false; + + // No source package name.. + if (Src.empty() == true) + Src = TmpSrc; + else + // if we have a source pkg name, make sure to only search + // for srcpkg names, otherwise apt gets confused if there + // is a binary package "pkg1" and a source package "pkg1" + // with the same name but that comes from different packages + MatchSrcOnly = true; // If we are matching by version then we need exact matches to be happy if (VerTag.empty() == false) @@ -1291,13 +1298,11 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, binary packages in the search */ pkgSrcRecords::Parser *Parse; SrcRecs.Restart(); - while ((Parse = SrcRecs.Find(Src.c_str(),false)) != 0) + while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { string Ver = Parse->Version(); - // Skip name mismatches - if (IsMatch == true && Parse->Package() != Src) - continue; + ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) { @@ -2632,7 +2637,7 @@ bool ShowHelp(CommandLine &CmdL) " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" - " purge - Remove and purge packages\n" + " purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" diff --git a/debian/changelog b/debian/changelog index 5ddd98a0d..6fe3b7a70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,26 @@ apt (0.7.20.3) UNRELEASED; urgency=low [ Michael Vogt ] * methods/gpgv.cc: - properly check for expired and revoked keys (closes: #433091) + * apt-pkg/contrib/strutl.cc: + - fix TimeToStr i18n (LP: #289807) + * [ABI break] merge support for http redirects, thanks to + Jeff Licquia and Anthony Towns + * [ABI break] use int for the package IDs (thanks to Steve Cotton) + * apt-pkg/pkgcache.cc: + - do not run "dpkg --configure pkg" if pkg is in trigger-awaited + state (LP: #322955) + * methods/https.cc: + - add Acquire::https::AllowRedirect support + * Clarify the --help for 'purge' (LP: #243948) + * cmdline/apt-get.cc + - fix "apt-get source pkg" if there is a binary package and + a source package of the same name but from different + packages (LP: #330103) + + [ Colin Watson ] + * cmdline/acqprogress.cc: + - Call pkgAcquireStatus::Pulse even if quiet, so that we still get + dlstatus messages on the status-fd (LP: #290234). -- Michael Vogt Wed, 08 Apr 2009 22:37:01 +0200 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index db07f189e..5f29a2d3f 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -133,7 +133,8 @@ Acquire Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting Timeout "120"; Pipeline-Depth "5"; - + AllowRedirect "true"; + // Cache Control. Note these do not work with Squid 2.0.2 No-Cache "false"; Max-Age "86400"; // 1 Day age on index files @@ -150,7 +151,8 @@ Acquire Verify-Peer "false"; SslCert "/etc/apt/some.pem"; CaPath "/etc/ssl/certs"; - Verify-Host" "2"; + Verify-Host" "true"; + AllowRedirect "true"; }; ftp diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 8de3a0b9e..ff9a92d32 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -463,6 +463,7 @@ bool CacheDB::Clean() Cursor->c_del(Cursor,0); } + Dbp->compact(Dbp, NULL, NULL, NULL, NULL, DB_FREE_SPACE, NULL); return true; } diff --git a/methods/http.cc b/methods/http.cc index b3c791fa0..1bf798da4 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -39,6 +39,7 @@ #include #include #include +#include #include // Internet stuff @@ -57,6 +58,7 @@ int HttpMethod::FailFd = -1; time_t HttpMethod::FailTime = 0; unsigned long PipelineDepth = 10; unsigned long TimeOut = 120; +bool AllowRedirect = false; bool Debug = false; URI Proxy; @@ -628,6 +630,12 @@ bool ServerState::HeaderLine(string Line) return true; } + if (stringcasecmp(Tag,"Location:") == 0) + { + Location = Val; + return true; + } + return true; } /*}}}*/ @@ -900,7 +908,9 @@ bool HttpMethod::ServerDie(ServerState *Srv) 1 - IMS hit 3 - Unrecoverable error 4 - Error with error content page - 5 - Unrecoverable non-server error (close the connection) */ + 5 - Unrecoverable non-server error (close the connection) + 6 - Try again with a new or changed URI + */ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) { // Not Modified @@ -912,6 +922,27 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv) return 1; } + /* Redirect + * + * Note that it is only OK for us to treat all redirection the same + * because we *always* use GET, not other HTTP methods. There are + * three redirection codes for which it is not appropriate that we + * redirect. Pass on those codes so the error handling kicks in. + */ + if (AllowRedirect + && (Srv->Result > 300 && Srv->Result < 400) + && (Srv->Result != 300 // Multiple Choices + && Srv->Result != 304 // Not Modified + && Srv->Result != 306)) // (Not part of HTTP/1.1, reserved) + { + if (!Srv->Location.empty()) + { + NextURI = Srv->Location; + return 6; + } + /* else pass through for error message */ + } + /* We have a reply we dont handle. This should indicate a perm server failure */ if (Srv->Result < 200 || Srv->Result >= 300) @@ -1026,6 +1057,7 @@ bool HttpMethod::Configuration(string Message) if (pkgAcqMethod::Configuration(Message) == false) return false; + AllowRedirect = _config->FindB("Acquire::http::AllowRedirect",true); TimeOut = _config->FindI("Acquire::http::Timeout",TimeOut); PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth", PipelineDepth); @@ -1039,6 +1071,10 @@ bool HttpMethod::Configuration(string Message) /* */ int HttpMethod::Loop() { + typedef vector StringVector; + typedef vector::iterator StringVectorIterator; + map Redirected; + signal(SIGTERM,SigTerm); signal(SIGINT,SigTerm); @@ -1225,6 +1261,46 @@ int HttpMethod::Loop() break; } + // Try again with a new URL + case 6: + { + // Clear rest of response if there is content + if (Server->HaveContent) + { + File = new FileFd("/dev/null",FileFd::WriteExists); + Server->RunData(); + delete File; + File = 0; + } + + /* Detect redirect loops. No more redirects are allowed + after the same URI is seen twice in a queue item. */ + StringVector &R = Redirected[Queue->DestFile]; + bool StopRedirects = false; + if (R.size() == 0) + R.push_back(Queue->Uri); + else if (R[0] == "STOP" || R.size() > 10) + StopRedirects = true; + else + { + for (StringVectorIterator I = R.begin(); I != R.end(); I++) + if (Queue->Uri == *I) + { + R[0] = "STOP"; + break; + } + + R.push_back(Queue->Uri); + } + + if (StopRedirects == false) + Redirect(NextURI); + else + Fail(); + + break; + } + default: Fail(_("Internal error")); break; diff --git a/methods/http.h b/methods/http.h index 6753a9901..13f02ec77 100644 --- a/methods/http.h +++ b/methods/http.h @@ -99,6 +99,7 @@ struct ServerState enum {Chunked,Stream,Closes} Encoding; enum {Header, Data} State; bool Persistent; + string Location; // This is a Persistent attribute of the server itself. bool Pipeline; @@ -143,6 +144,8 @@ class HttpMethod : public pkgAcqMethod static time_t FailTime; static void SigTerm(int); + string NextURI; + public: friend class ServerState; diff --git a/methods/https.cc b/methods/https.cc index 98dfeefa1..8bf44b52a 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -208,6 +208,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); + // set redirect options and default to 10 redirects + bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect); + curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10); + // debug if(_config->FindB("Debug::Acquire::https", false)) curl_easy_setopt(curl, CURLOPT_VERBOSE, true); @@ -248,7 +253,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // cleanup if(success != 0) { - unlink(File->Name().c_str()); _error->Error("%s", curl_errorstr); Fail(); return true; diff --git a/methods/makefile b/methods/makefile index d9481dbcc..78bdbc96f 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.6 +LIB_APT_PKG_MAJOR = 4.7 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method diff --git a/pre-build.sh b/pre-build.sh new file mode 100755 index 000000000..2c7d28c2c --- /dev/null +++ b/pre-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +make -f Makefile startup doc -- cgit v1.2.3-70-g09d2 From f0bb64930676131f8df667e064ed8b1d1b14145b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 14 Apr 2009 14:17:40 +0200 Subject: build fixes, change version 0.7.21 --- apt-pkg/deb/debsystem.cc | 1 + cmdline/apt-get.cc | 4 +++- debian/changelog | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index baa98f546..ccd45d51b 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ccf53ed25..028f371b5 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1301,7 +1301,9 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { string Ver = Parse->Version(); - + + // show name mismatches + if (IsMatch == true && Parse->Package() != Src) ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str()); if (VerTag.empty() == false) diff --git a/debian/changelog b/debian/changelog index 6fe3b7a70..58fa99d7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.20.3) UNRELEASED; urgency=low +apt (0.7.21) unstable; urgency=low [ Christian Perrier ] * Translations: @@ -39,7 +39,7 @@ apt (0.7.20.3) UNRELEASED; urgency=low - Call pkgAcquireStatus::Pulse even if quiet, so that we still get dlstatus messages on the status-fd (LP: #290234). - -- Michael Vogt Wed, 08 Apr 2009 22:37:01 +0200 + -- Michael Vogt Tue, 14 Apr 2009 14:12:51 +0200 apt (0.7.20.2) unstable; urgency=medium -- cgit v1.2.3-70-g09d2 From 26356e000d19b9e39bf6194778225eb1bccc8012 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 22 Apr 2009 10:15:08 +0200 Subject: Fix typo in French translation --- debian/changelog | 8 ++++++++ doc/fr/apt-get.fr.8.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 58fa99d7a..f4c013146 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.22) UNRELEASED; urgency=low + + * Documentation translations: + - Fix a typo in apt-get(8 French translation. Closes: #525043 + Thanks to Guillaume Delacour for spotting it. + + -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 + apt (0.7.21) unstable; urgency=low [ Christian Perrier ] diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml index dccf415b1..c1b8552cb 100644 --- a/doc/fr/apt-get.fr.8.xml +++ b/doc/fr/apt-get.fr.8.xml @@ -201,7 +201,7 @@ semblables Avec la commande build-dep, apt-get installe ou supprime des paquets dans le but de satisfaire les dpendances de construction d'un paquet source. -Pour l'instant, dans la cas d'un paquet virtuel, un paquet est choisi au +Pour l'instant, dans le cas d'un paquet virtuel, un paquet est choisi au hasard. -- cgit v1.2.3-70-g09d2 From 3a1a4a55ccaea9f9fa38d7fd0cf6acfb5efbf824 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 23 Apr 2009 08:05:00 +0200 Subject: Update French translation --- debian/changelog | 2 ++ po/ChangeLog | 1 + po/fr.po | 24 ++++++++++-------------- 3 files changed, 13 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f4c013146..0d4ed4e78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.22) UNRELEASED; urgency=low * Documentation translations: - Fix a typo in apt-get(8 French translation. Closes: #525043 Thanks to Guillaume Delacour for spotting it. + * Translations: + - fr.po -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/po/ChangeLog b/po/ChangeLog index 0817285c7..98dce6313 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -2,6 +2,7 @@ * Update all PO files and apt-all.pot. 545 strings. Formerly complete PO files are now 539t1f6u + * fr.po: updated to 545t. 2009-03-19 Ivan Masár diff --git a/po/fr.po b/po/fr.po index 1ce3a3d11..780199e64 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,4 +1,3 @@ -# translation of fr.po to French # translation of apt to French # Advanced Package Transfer - APT message translation catalog # French messages @@ -10,13 +9,13 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2009-02-24 08:32+0100\n" +"PO-Revision-Date: 2009-04-23 08:03+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.3\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n" #: cmdline/apt-cache.cc:143 @@ -1018,7 +1017,7 @@ msgstr "Version choisie %s (%s) pour %s\n" #: cmdline/apt-get.cc:1307 #, c-format msgid "No source package '%s' picking '%s' instead\n" -msgstr "" +msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n" #: cmdline/apt-get.cc:1345 msgid "The update command takes no arguments" @@ -1267,8 +1266,7 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" #: cmdline/apt-get.cc:2551 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "" -"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." #: cmdline/apt-get.cc:2555 msgid "Failed to process build dependencies" @@ -1279,7 +1277,6 @@ msgid "Supported modules:" msgstr "Modules reconnus :" #: cmdline/apt-get.cc:2628 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2147,25 +2144,25 @@ msgstr "" #: apt-pkg/contrib/strutl.cc:335 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%lid %lih %limin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:342 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%lih %limin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:349 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%limin %lis" #. s means seconds #: apt-pkg/contrib/strutl.cc:354 #, c-format msgid "%lis" -msgstr "" +msgstr "%lis" #: apt-pkg/contrib/strutl.cc:1018 #, c-format @@ -2773,8 +2770,7 @@ msgstr "Somme de contrôle de hachage incohérente" #: apt-pkg/acquire-item.cc:1118 msgid "There is no public key available for the following key IDs:\n" -msgstr "" -"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" #: apt-pkg/acquire-item.cc:1231 #, c-format @@ -2995,7 +2991,7 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -msgstr "" +msgstr "Non verrouillé" #: methods/rred.cc:219 msgid "Could not patch file" -- cgit v1.2.3-70-g09d2 From 0365a8b90cd13a4010006c9cf087657dcf6dac7a Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 28 Apr 2009 20:18:01 +0200 Subject: Slovak translation update --- debian/changelog | 1 + po/ChangeLog | 4 ++++ po/sk.po | 19 +++++++++---------- 3 files changed, 14 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0d4ed4e78..23416bd70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.22) UNRELEASED; urgency=low Thanks to Guillaume Delacour for spotting it. * Translations: - fr.po + - sk.po. Closes: #525857 -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/po/ChangeLog b/po/ChangeLog index 98dce6313..589be588f 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-04-28 Ivan Masár + + * sk.po: Updated to 539t + 2009-04-23 Christian Perrier * Update all PO files and apt-all.pot. 545 strings. diff --git a/po/sk.po b/po/sk.po index 432bd0653..5e05ebc33 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2009-04-08 16:08+0100\n" +"PO-Revision-Date: 2009-04-27 16:43+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" @@ -996,7 +996,7 @@ msgstr "Zvolená verzia %s (%s) pre %s\n" #: cmdline/apt-get.cc:1307 #, c-format msgid "No source package '%s' picking '%s' instead\n" -msgstr "" +msgstr "Zdrojový balík „%s“ neexistuje, namiesto neho sa použije „%s“\n" #: cmdline/apt-get.cc:1345 msgid "The update command takes no arguments" @@ -1246,7 +1246,6 @@ msgid "Supported modules:" msgstr "Podporované moduly:" #: cmdline/apt-get.cc:2628 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1303,7 +1302,7 @@ msgstr "" "deb)\n" " remove - Odstráni balíky\n" " autoremove - Automaticky odstráni všetky nepoužité balíky\n" -" purge - Odstráni a vyčistí balíky\n" +" purge - Odstráni a balíky a ich konfiguračné súbory\n" " source - Stiahne zdrojové archívy\n" " build-dep - Nastaví závislosti kompilácie pre zdrojové balíky\n" " dist-upgrade - Aktualizácia distribúcie, viď apt-get(8)\n" @@ -2093,25 +2092,25 @@ msgstr "" #: apt-pkg/contrib/strutl.cc:335 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%li d %li h %li min %li s" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:342 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%li h %li min %li s" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:349 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%li min %li s" #. s means seconds #: apt-pkg/contrib/strutl.cc:354 #, c-format msgid "%lis" -msgstr "" +msgstr "%li s" #: apt-pkg/contrib/strutl.cc:1018 #, c-format @@ -2253,7 +2252,7 @@ msgstr "Súbor zámku %s sa nedá otvoriť" #: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Zamykanie pre súbor zámku %s pripojený cez nfs sa nepoužíva" +msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva" #: apt-pkg/contrib/fileutl.cc:176 #, c-format @@ -2911,7 +2910,7 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -msgstr "" +msgstr "Nie je zamknuté" #: methods/rred.cc:219 msgid "Could not patch file" -- cgit v1.2.3-70-g09d2 From 0d7c7d52dce1aef916bd4777cac75a6a85e71bf1 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 17 May 2009 08:50:40 +0200 Subject: Basque translation update --- debian/changelog | 2 + po/eu.po | 223 +++++++++++-------------- po/ru.po | 501 +++++++++++++++++++++++++++++-------------------------- 3 files changed, 357 insertions(+), 369 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 23416bd70..09c0bb05c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.22) UNRELEASED; urgency=low * Translations: - fr.po - sk.po. Closes: #525857 + - ru.po. Closes: #526816 + - eu.po. Closes: #528985 -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/po/eu.po b/po/eu.po index 7b1f59584..1664552b5 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2,13 +2,13 @@ # This file is put in the public domain. # # Hizkuntza Politikarako Sailburuordetza , 2005. -# Piarres Beobide , 2005, 2006, 2007, 2008. +# Piarres Beobide , 2005, 2006, 2007, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2008-11-18 10:32+0100\n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" "MIME-Version: 1.0\n" @@ -83,7 +83,7 @@ msgstr "Guztira bateratutako kateak: " #: cmdline/apt-cache.cc:330 msgid "Total dependency version space: " -msgstr "Guztira bertsio dependentzi lekua: " +msgstr "Guztira bertsio dependentzia lekua: " #: cmdline/apt-cache.cc:335 msgid "Total slack space: " @@ -160,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" @@ -654,7 +654,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -815,11 +815,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Ezin izan da Iturburu zerrenda irakurri." @@ -850,7 +850,7 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -887,7 +887,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -896,7 +896,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -993,24 +993,19 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1307 -#, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "" - -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda direktorioa blokeatu" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1018,11 +1013,11 @@ msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." msgstr "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1040,43 +1035,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" msgstr "Ezin izan da %s zeregina aurkitu" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1084,7 +1079,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1720 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1096,117 +1091,117 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1214,7 +1209,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1223,33 +1218,32 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2628 -#, fuzzy +#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1265,7 +1259,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1305,7 +1299,7 @@ msgstr "" " upgrade - Egin bertsio berritzea\n" " install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n" " remove - Kendu paketeak\n" -" autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n" +" autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n" " purge - Paketeak kendu eta garbitu\n" " source - Deskargatu iturburu artxiboak\n" " build-dep - Konfiguratu iturburu paketeen eraikitze dependentziak\n" @@ -1868,7 +1862,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1953,38 +1947,38 @@ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" msgid "Unable to connect to %s %s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:71 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Ezin da eraztuna ebatzi: '%s'" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2002,80 +1996,80 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki" msgid "Read error from %s process" msgstr "Irakurri errorea %s prozesutik" -#: methods/http.cc:379 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Goiburuen zain" -#: methods/http.cc:525 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean" -#: methods/http.cc:533 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Okerreko goiburu-lerroa" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du." -#: methods/http.cc:588 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du" -#: methods/http.cc:603 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du" -#: methods/http.cc:605 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "http zerbitzariak barruti onarpena apurturik du" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:782 +#: methods/http.cc:774 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:787 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:810 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:841 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:869 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:883 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:885 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Huts fitxategia mozterakoan" -#: methods/http.cc:1141 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1305 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Barne errorea" @@ -2094,32 +2088,10 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko " +"balioa: %lu. (man 5 apt.conf)" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" @@ -2551,7 +2523,7 @@ msgstr "Ezin izan da %s metodo kontrolatzailea aurkitu." msgid "Method %s did not start correctly" msgstr "%s metodoa ez da behar bezala abiarazi" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu" @@ -2915,16 +2887,12 @@ msgstr "%s guztiz ezabatzeko prestatzen" msgid "Completely removed %s" msgstr "%s guztiz ezabatu da" -#: apt-pkg/deb/dpkgpm.cc:789 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Ezin da erregistroa idatzi, openpty() -ek huts egin du (/dev/pts ez dago " "muntaturik?)\n" -#: apt-pkg/deb/debsystem.cc:100 -msgid "Not locked" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Ezin izan zaio fitxategiari adabakia ezarri" @@ -2932,6 +2900,3 @@ msgstr "Ezin izan zaio fitxategiari adabakia ezarri" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" - -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "MMap dinamiko funtzioa leku gabe geratzen ari da" diff --git a/po/ru.po b/po/ru.po index 659a10f3f..17b69b217 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,13 +8,14 @@ # Dmitry Astapov , 2004. # Dmitry Astapov , 2004. # Yuri Kozlov , 2004, 2005, 2006, 2007, 2008. +# Yuri Kozlov , 2009. msgid "" msgstr "" -"Project-Id-Version: apt 0.7.19\n" +"Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2008-11-16 21:10+0300\n" -"Last-Translator: Yuri Kozlov \n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"PO-Revision-Date: 2009-05-03 22:01+0400\n" +"Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -94,7 +95,7 @@ msgstr "Всего информации о зависимостях: " #: cmdline/apt-cache.cc:335 msgid "Total slack space: " -msgstr "Пустого места в кеше: " +msgstr "Пустого места в кэше: " #: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " @@ -119,7 +120,7 @@ msgstr "Списки пакетов:" #: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Кеш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" +msgstr "Кэш рассинхронизирован, невозможно обнаружить ссылку на список пакетов" #: cmdline/apt-cache.cc:1532 #, c-format @@ -165,7 +166,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" @@ -214,10 +215,10 @@ msgstr "" " или: apt-cache [параметры] showsrc пакет1 [пакет2 ...]\n" "\n" "apt-cache -- низкоуровневый инструмент, используемый для управления\n" -"двоичными кеш-файлами APT и поиску по ним\n" +"двоичными кэш-файлами APT и поиску по ним\n" "Команды:\n" -" add - добавить файл пакета в кеш исходников\n" -" gencaches - построить оба кеша пакетов - двоичных и с исходным кодом\n" +" add - добавить файл пакета в кэш источников\n" +" gencaches - построить кэш пакетов и кэш источников\n" " showpkg - показать общую информацию о конкретном пакете\n" " stats - показать общую статистику\n" " dump - показать весь файл в сокращённой форме\n" @@ -234,13 +235,12 @@ msgstr "" "\n" "Параметры:\n" " -h Этот текст.\n" -" -p=? Кеш пакетов.\n" -" -s=? Кеш пакетов исходного кода.\n" +" -p=? Кэш пакетов.\n" +" -s=? Кэш источников.\n" " -q Не показывать индикатор прогресса.\n" " -i Показывать только важные зависимости для команды unmet.\n" " -c=? Читать указанный файл настройки.\n" -" -o=? Задать произвольный параметра настройки, например, -o dir::cache=/" -"tmp\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" "Подробности в справочных страницах apt-cache(8) и apt.conf(5).\n" #: cmdline/apt-cdrom.cc:78 @@ -274,18 +274,19 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Использование: apt-config [options] command\n" +"Использование: apt-config [параметры] команда\n" "\n" -"apt-config - простой инструмент для чтения конфигурационного файла APT\n" +"apt-config -- простой инструмент для чтения файла настройки APT\n" "\n" "Команды:\n" " shell - режим shell\n" -" dump - показать конфигурацию\n" +" dump - показать настройки\n" "\n" -"Опции:\n" +"Параметры:\n" " -h Этот текст.\n" -" -с=? Читать указанный конфигурационный файл.\n" -" -o=? Установить произвольную опцию, к примеру, -o dir::cache=/tmp\n" +" -с=? Читать указанный файл настройки.\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/" +"tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -305,16 +306,15 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Использование: apt-extracttemplates file1 [file2 ...]\n" +"Использование: apt-extracttemplates файл1 [файл2 ...]\n" "\n" -"apt-extracttemplates извлекает из пакетов Debian конфигурационные скрипты\n" -"и файлы-шаблоны\n" +"apt-extracttemplates извлекает из пакетов Debian данные config и template\n" "\n" -"Опции:\n" +"Параметры:\n" " -h Этот текст\n" -" -t Установить каталог для временных файлов\n" -" -c=? Читать указанный конфигурационный файл\n" -" -o=? Указать произвольную опцию, к примеру, -o dir::cache=/tmp\n" +" -t Задать каталог для временных файлов\n" +" -c=? Читать указанный файл настройки\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 #, c-format @@ -338,9 +338,7 @@ msgstr "Ошибка обработки каталога %s" #: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "" -"Список расширений, допустимых для пакетов с исходными текстами, слишком " -"длинен" +msgstr "Список расширений источников слишком длинен" #: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" @@ -429,15 +427,14 @@ msgstr "" "Параметры:\n" " -h Этот текст\n" " --md5 Управление генерацией MD5-хешей\n" -" -s=? Указать файл переназначений (override) для пакетов с исходными " -"текстами\n" +" -s=? Указать файл переназначений (override) для источников\n" " -q Не выводить сообщения в процессе работы\n" -" -d=? Указать кеширующую базу данных (не обязательно)\n" +" -d=? Указать кэширующую базу данных (не обязательно)\n" " --no-delink Включить режим отладки процесса удаления файлов\n" " --contents Управление генерацией полного перечня содержимого пакетов\n" " (файла Contents)\n" -" -c=? Использовать указанный конфигурационный файл\n" -" -o=? Указать произвольный параметр конфигурации" +" -c=? Использовать указанный файл настройки\n" +" -o=? Задать значение произвольному параметру настройки" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" @@ -670,7 +667,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@ -820,7 +817,7 @@ msgstr "Некоторые пакеты невозможно аутентифи #: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 msgid "There are problems and -y was used without --force-yes" -msgstr "Существуют проблемы, а опция -y использована без --force-yes" +msgstr "Существуют проблемы, а параметр -y указан без --force-yes" #: cmdline/apt-get.cc:773 msgid "Internal error, InstallPackages was called with broken packages!" @@ -836,11 +833,11 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" -msgstr "Невозможно заблокировать каталог для загрузки" +msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -873,7 +870,7 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на %" "sB.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -912,26 +909,26 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Не удалось загрузить %s %s\n" +msgstr "Не удалось получить %s %s\n" #: cmdline/apt-get.cc:1002 msgid "Some files failed to download" -msgstr "Некоторые файлы не удалось загрузить" +msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" -msgstr "Указан режим \"только загрузка\", и загрузка завершена" +msgstr "Указан режим \"только скачивание\", и скачивание завершено" #: cmdline/apt-get.cc:1009 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get " -"update или попытаться повторить запуск с ключом --fix-missing" +"Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " +"или попытаться повторить запуск с ключом --fix-missing" #: cmdline/apt-get.cc:1013 msgid "--fix-missing and media swapping is not currently supported" @@ -953,8 +950,7 @@ msgstr "Заметьте, вместо %2$s выбирается %1$s\n" #: cmdline/apt-get.cc:1063 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "" -"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n" +msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n" #: cmdline/apt-get.cc:1081 #, c-format @@ -997,7 +993,7 @@ msgstr "Для пакета %s не найдены кандидаты на ус #: cmdline/apt-get.cc:1156 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Переустановка %s невозможна, он не загружается.\n" +msgstr "Переустановка %s невозможна, он не скачивается.\n" #: cmdline/apt-get.cc:1164 #, c-format @@ -1019,34 +1015,29 @@ msgstr "Версия '%s' для '%s' не найдена" msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#: cmdline/apt-get.cc:1307 -#, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "" - -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." msgstr "Для их удаления используйте 'apt-get autoremove'." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1064,45 +1055,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" msgstr "Не удалось найти задачу %s" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1110,7 +1101,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1720 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1121,121 +1112,118 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" -"Укажите как минимум один пакет, для которого необходимо загрузить исходные " -"тексты" +"Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" -msgstr "Невозможно найти пакет с исходными текстами для %s" +msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Пропускаем уже загруженный файл '%s'\n" +msgstr "Пропускаем уже скачанный файл '%s'\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n" +msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Нужно загрузить %sB архивов с исходными текстами.\n" +msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" -msgstr "Загрузка исходных текстов %s\n" +msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." -msgstr "Некоторые архивы не удалось загрузить." +msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "" -"Распаковка исходных текстов пропущена, так как в %s уже находятся " -"распакованные исходные тексты\n" +msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1244,7 +1232,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1253,33 +1241,74 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2628 +#: cmdline/apt-get.cc:2619 #, fuzzy +#| msgid "" +#| "Usage: apt-get [options] command\n" +#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" +#| " apt-get [options] source pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-get is a simple command line interface for downloading and\n" +#| "installing packages. The most frequently used commands are update\n" +#| "and install.\n" +#| "\n" +#| "Commands:\n" +#| " update - Retrieve new lists of packages\n" +#| " upgrade - Perform an upgrade\n" +#| " install - Install new packages (pkg is libc6 not libc6.deb)\n" +#| " remove - Remove packages\n" +#| " autoremove - Remove automatically all unused packages\n" +#| " purge - Remove packages and config files\n" +#| " source - Download source archives\n" +#| " build-dep - Configure build-dependencies for source packages\n" +#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n" +#| " dselect-upgrade - Follow dselect selections\n" +#| " clean - Erase downloaded archive files\n" +#| " autoclean - Erase old downloaded archive files\n" +#| " check - Verify that there are no broken dependencies\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -q Loggable output - no progress indicator\n" +#| " -qq No output except for errors\n" +#| " -d Download only - do NOT install or unpack archives\n" +#| " -s No-act. Perform ordering simulation\n" +#| " -y Assume Yes to all queries and do not prompt\n" +#| " -f Attempt to correct a system with broken dependencies in place\n" +#| " -m Attempt to continue if archives are unlocatable\n" +#| " -u Show a list of upgraded packages as well\n" +#| " -b Build the source package after fetching it\n" +#| " -V Show verbose version numbers\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +#| "pages for more information and options.\n" +#| " This APT has Super Cow Powers.\n" msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1295,7 +1324,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1326,49 +1355,50 @@ msgstr "" " apt-get [параметры] install|remove pkg1 [pkg2 ...]\n" " apt-get [параметры] source pkg1 [pkg2 ...]\n" "\n" -"apt-get -- простой интерфейс командной строки для загрузки и\n" -"установки пакетов. Наиболее часто используемые команды -- update \n" -"и install.\n" +"apt-get -- простая программа с интерфейсом командной строки\n" +"для скачивания и установки пакетов. Наиболее часто используемые\n" +"команды -- update и install.\n" "\n" "Команды:\n" -" update - получить новые списки пакетов\n" +" update - получить новые списки пакетов\n" " upgrade - выполнить обновление\n" -" install - установить новые пакеты (имя пакета указывается\n" -" как libc6, а не libc6.deb)\n" -" remove - удалить пакеты\n" +" install - установить новые пакеты (на месте pkg указывается имя пакета\n" +" (libc6), а не имя файла (libc6.deb))\n" +" remove - удалить пакеты\n" " autoremove - автоматически удалить все неиспользуемые пакеты\n" -" purge - удалить и вычистить пакеты\n" -" source - загрузить архивы с исходными текстами\n" -" build-dep - загрузить всё необходимое для сборки указанного\n" -" пакета из исходных текстов\n" +" purge - удалить пакеты вместе с их файлами настройки\n" +" source - скачать архивы с исходным кодом\n" +" build-dep - настроить всё необходимое для сборки\n" +" пакета с исходным кодом\n" " dist-upgrade - обновить всю систему, подробнее в apt-get(8)\n" -" dselect-upgrade - руководствоваться выбором, сделанным в dselect'е\n" -" clean - удалить загруженные файлы архивов\n" -" autoclean - удалить старые загруженные файлы архивов\n" -" check - проверить наличие нарушенных зависимостей\n" +" dselect-upgrade - руководствоваться выбором, сделанным в dselect\n" +" clean - удалить скачанные файлы архивов\n" +" autoclean - удалить старые скачанные файлы архивов\n" +" check - проверить наличие нарушенных зависимостей\n" "\n" "Параметры:\n" -" -h этот текст\n" -" -q выводить сообщения, пригодные для записи в файл журнала,\n" -" не выводить индикатор хода работы\n" -" -qq выводить только сообщения об ошибках\n" -" -d только загрузить - НЕ устанавливать и не распаковывать архивы\n" -" -s не выполнять действия на самом деле, только имитация работы\n" -" -y отвечать \"Да\" на все вопросы, cами вопросы при этом не выводятся\n" -" -f продолжать, даже если проверка целостности не прошла\n" -" -m продолжать, даже если местоположение архивов неизвестно\n" -" -u показывать также список обновляемых пакетов\n" -" -b собрать пакет из исходных текстов после получения\n" -" -V показать полные номера версий\n" +" -h этот текст\n" +" -q выводить сообщения, пригодные для записи в файл журнала,\n" +" не выводить индикатор хода работы\n" +" -qq выводить только сообщения об ошибках\n" +" -d только скачать - НЕ устанавливать и не распаковывать архивы\n" +" -s не выполнять действия на самом деле, только имитация работы\n" +" -y отвечать \"Да\" на все вопросы, сами вопросы при этом не выводить\n" +" -f попытаться исправить систему, имеющую сломанные зависимости\n" +" -m продолжать, даже если местоположение архивов неизвестно\n" +" -u показывать также список обновляемых пакетов\n" +" -b собрать пакет из исходного кода после его получения\n" +" -V показать полные номера версий\n" " -c=? читать указанный файл настройки\n" -" -o=? задать произвольный параметр настройки, например, -o dir::cache=/tmp\n" -"Страницы руководства apt-get(8), sources.list(5) и apt.conf(5)\n" +" -o=? задать значение произвольному параметру настройки, например, -o dir::" +"cache=/tmp\n" +"Справочные страницы apt-get(8), sources.list(5) и apt.conf(5)\n" "содержат подробную информацию и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" #: cmdline/acqprogress.cc:55 msgid "Hit " -msgstr "В кеше " +msgstr "В кэше " #: cmdline/acqprogress.cc:79 msgid "Get:" @@ -1420,16 +1450,17 @@ msgid "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -"Использование: apt-sortpkgs [параметры] file1 [file2 ...]\n" +"Использование: apt-sortpkgs [параметры] файл1 [файл2 ...]\n" "\n" -"apt-sortpkgs - простой инструмент для сортировки списков пакетов. Опция -s\n" -"используется, чтобы указать тип списка.\n" +"apt-sortpkgs - простой инструмент для сортировки списков пакетов. Параметр -" +"s\n" +"используется для указания типа списка.\n" "\n" "Параметры:\n" " -h этот текст\n" -" -s сортировать список файлов с исходными текстами\n" -" -c=? читать указанный файл конфигурации\n" -" -o=? установить произвольную опцию, например, -o dir::cache=/tmp\n" +" -s сортировать список файлов пакетов исходного кода\n" +" -c=? читать указанный файл настройки\n" +" -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" @@ -1538,7 +1569,7 @@ msgstr "Двойное добавление diversion %s -> %s" #: apt-inst/filelist.cc:549 #, c-format msgid "Duplicate conf file %s/%s" -msgstr "Повторно указанный конфигурационный файл %s/%s" +msgstr "Повторно указан файл настройки %s/%s" #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format @@ -1690,7 +1721,7 @@ msgstr "Внутренняя ошибка при добавлении diversion" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "В первую очередь должен быть проинициализирован кеш пакетов" +msgstr "В первую очередь должен быть проинициализирован кэш пакетов" #: apt-inst/deb/dpkgdb.cc:439 #, c-format @@ -1902,14 +1933,14 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Невозможно загрузить файл, сервер сообщил: '%s'" +msgstr "Невозможно получить файл, сервер сообщил: '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1987,42 +2018,42 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Невозможно соединиться с %s %s:" -#: methods/gpgv.cc:71 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Нет доступа к связке (keyring) ключей: '%s'" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " "работы." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2040,80 +2071,80 @@ msgstr "Не удалось открыть канал для %s" msgid "Read error from %s process" msgstr "Ошибка чтения из процесса %s" -#: methods/http.cc:379 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Ожидание заголовков" -#: methods/http.cc:525 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Получен заголовок длиннее %u символов" -#: methods/http.cc:533 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Неверный заголовок" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Http-сервер послал неверный заголовок" -#: methods/http.cc:588 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Http сервер послал неверный заголовок Content-Length" -#: methods/http.cc:603 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Http-сервер послал неверный заголовок Content-Range" -#: methods/http.cc:605 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов" +msgstr "Этот HTTP-сервер не поддерживает скачивание фрагментов файлов" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:782 +#: methods/http.cc:774 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:787 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:810 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:841 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:869 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:883 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:885 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Не удалось обрезать файл" -#: methods/http.cc:1141 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1305 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2132,32 +2163,10 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. " +"Текущее значение: %lu. (man 5 apt.conf)" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Не найдено: %s" @@ -2170,7 +2179,7 @@ msgstr "Неизвестная аббревиатура типа: '%c'" #: apt-pkg/contrib/configuration.cc:497 #, c-format msgid "Opening configuration file %s" -msgstr "Открытие файла конфигурации %s" +msgstr "Открытие файла настройки %s" #: apt-pkg/contrib/configuration.cc:662 #, c-format @@ -2227,38 +2236,38 @@ msgstr "%c%s... Готово" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Неизвестная опция командной строки '%c' [из %s]." +msgstr "Неизвестный параметр командной строки '%c' [из %s]." #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" -msgstr "Не распознанная опция командной строки %s" +msgstr "Не распознанный параметр командной строки %s" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Опция командной строки %s - не логический переключатель \"да/нет\"" +msgstr "Параметр командной строки %s - не логический переключатель \"да/нет\"" #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "Опция %s требует аргумента." +msgstr "Для параметра %s требуется аргумент." #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =." -msgstr "Опция %s: значение должно иметь вид =." +msgstr "Значение параметра %s должно иметь вид =." #: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Опция %s требует аргумент в виде целого числа, а не '%s'" +msgstr "Для параметра %s требуется аргумент в виде целого числа, а не '%s'" #: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "Слишком длинная опция '%s'" +msgstr "Параметр '%s' слишком длинный" #: apt-pkg/contrib/cmndline.cc:298 #, c-format @@ -2360,15 +2369,15 @@ msgstr "Проблема при синхронизации файловых бу #: apt-pkg/pkgcache.cc:132 msgid "Empty package cache" -msgstr "Кеш пакетов пуст" +msgstr "Кэш пакетов пуст" #: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Кеш пакетов повреждён" +msgstr "Кэш пакетов повреждён" #: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" -msgstr "Не поддерживаемая версия кеша пакетов" +msgstr "Не поддерживаемая версия кэша пакетов" #: apt-pkg/pkgcache.cc:148 #, c-format @@ -2377,7 +2386,7 @@ msgstr "Данный APT не поддерживает систему верси #: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" -msgstr "Кеш пакетов был собран для другой архитектуры" +msgstr "Кэш пакетов был собран для другой архитектуры" #: apt-pkg/pkgcache.cc:224 msgid "Depends" @@ -2528,7 +2537,8 @@ msgstr "" "Вследствие возникновения циклических зависимостей типа Конфликтует/" "ПредЗависит, для продолжения установки необходимо временно удалить " "существенно важный пакет %s. Это может привести к фатальным последствиям. " -"Если вы действительно хотите продолжить, включите опцию APT::Force-LoopBreak." +"Если вы действительно хотите продолжить, установите параметр APT::Force-" +"LoopBreak." #: apt-pkg/pkgrecords.cc:32 #, c-format @@ -2559,8 +2569,8 @@ msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Некоторые индексные файлы не загрузились, они были проигнорированы или " -"вместо них были использованы старые версии" +"Некоторые индексные файлы не скачались, они были проигнорированы или вместо " +"них были использованы старые версии" #: apt-pkg/acquire.cc:59 #, c-format @@ -2577,12 +2587,12 @@ msgstr "Архивный каталог %spartial отсутствует." #: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Загружается файл %li из %li (%s осталось)" +msgstr "Скачивается файл %li из %li (осталось %s)" #: apt-pkg/acquire.cc:830 #, c-format msgid "Retrieving file %li of %li" -msgstr "Загружается файл %li из %li" +msgstr "Скачивается файл %li из %li" #: apt-pkg/acquire-worker.cc:110 #, c-format @@ -2594,7 +2604,7 @@ msgstr "Драйвер для метода %s не найден." msgid "Method %s did not start correctly" msgstr "Метод %s запустился не корректно" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод." @@ -2640,7 +2650,7 @@ msgstr "Для фиксации не указан приоритет (или у #: apt-pkg/pkgcachegen.cc:72 msgid "Cache has an incompatible versioning system" -msgstr "Кеш имеет несовместимую систему версий" +msgstr "Кэш имеет несовместимую систему версий" #: apt-pkg/pkgcachegen.cc:115 #, c-format @@ -2722,7 +2732,7 @@ msgstr "Во время обработки файла зависимостей #: apt-pkg/pkgcachegen.cc:690 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Не удалось получить атрибуты списка пакетов с исходными текстами %s" +msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" #: apt-pkg/pkgcachegen.cc:775 msgid "Collecting File Provides" @@ -2730,7 +2740,7 @@ msgstr "Сбор информации о Provides" #: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 msgid "IO Error saving source cache" -msgstr "Ошибка ввода/вывода при попытке сохранить кеш исходных текстов" +msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" #: apt-pkg/acquire-item.cc:127 #, c-format @@ -2832,8 +2842,8 @@ msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" "zu signatures\n" msgstr "" -"Найдено индексов: %zu для пакетов, %zu для пакетов c исходными текстами, %zu " -"для переводов и %zu для сигнатур\n" +"Найдено индексов: %zu для пакетов, %zu для источников, %zu для переводов и %" +"zu для сигнатур\n" #: apt-pkg/cdrom.cc:715 #, c-format @@ -2925,7 +2935,7 @@ msgstr "Распаковывается %s" #: apt-pkg/deb/dpkgpm.cc:611 #, c-format msgid "Preparing to configure %s" -msgstr "Подготавливается для конфигурации %s" +msgstr "Подготавливается для настройки %s" #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format @@ -2958,16 +2968,12 @@ msgstr "Подготовка к полному удалению %s" msgid "Completely removed %s" msgstr "%s полностью удалён" -#: apt-pkg/deb/dpkgpm.cc:789 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Не удалось записать в журнал, неудачное выполнение openpty() (/dev/pts не " "смонтирован?)\n" -#: apt-pkg/deb/debsystem.cc:100 -msgid "Not locked" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Не удалось пропатчить файл" @@ -2976,5 +2982,20 @@ msgstr "Не удалось пропатчить файл" msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "Выход за границы диапазона при работе MMap" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Нет пакета с исходным кодом '%s', вместо него берётся '%s'\n" + +#~ msgid "%lid %lih %limin %lis" +#~ msgstr "%liд %liч %liмин %liс" + +#~ msgid "%lih %limin %lis" +#~ msgstr "%liч %liмин %liс" + +#~ msgid "%limin %lis" +#~ msgstr "%liмин %liс" + +#~ msgid "%lis" +#~ msgstr "%liс" + +#~ msgid "Not locked" +#~ msgstr "Не заблокирован" -- cgit v1.2.3-70-g09d2 From 92df274bc1b1c633ee7475293503e6cf8a008cf2 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 17 May 2009 12:43:09 +0200 Subject: Asturian translation added --- debian/changelog | 2 + po/ast.po | 2901 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2903 insertions(+) create mode 100644 po/ast.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 09c0bb05c..6b98a1d67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.22) UNRELEASED; urgency=low - sk.po. Closes: #525857 - ru.po. Closes: #526816 - eu.po. Closes: #528985 + * Added translations + - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007 -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/po/ast.po b/po/ast.po new file mode 100644 index 000000000..bf5ab0dc3 --- /dev/null +++ b/po/ast.po @@ -0,0 +1,2901 @@ +msgid "" +msgstr "" +"Project-Id-Version: apt 0.7.18\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"PO-Revision-Date: 2009-05-17 10:52+0100\n" +"Last-Translator: Marcos Alvarez Costales \n" +"Language-Team: Asturian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#: cmdline/apt-cache.cc:143 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "El paquete %s versin %s nun cumple una dependencia:\n" + +#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 +#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 +#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 +#, c-format +msgid "Unable to locate package %s" +msgstr "Nun pue alcontrase'l paquete %s" + +#: cmdline/apt-cache.cc:247 +msgid "Total package names: " +msgstr "Total de nomes de paquetes: " + +#: cmdline/apt-cache.cc:287 +msgid " Normal packages: " +msgstr " Paquetes normales: " + +#: cmdline/apt-cache.cc:288 +msgid " Pure virtual packages: " +msgstr " Paquetes virtuales puros: " + +#: cmdline/apt-cache.cc:289 +msgid " Single virtual packages: " +msgstr " Paquetes virtuales cenciellos: " + +#: cmdline/apt-cache.cc:290 +msgid " Mixed virtual packages: " +msgstr " Paquetes virtuales amestaos: " + +#: cmdline/apt-cache.cc:291 +msgid " Missing: " +msgstr " Falten: " + +#: cmdline/apt-cache.cc:293 +msgid "Total distinct versions: " +msgstr "Versiones distintes en total: " + +#: cmdline/apt-cache.cc:295 +msgid "Total distinct descriptions: " +msgstr "Descriciones distintes en total: " + +#: cmdline/apt-cache.cc:297 +msgid "Total dependencies: " +msgstr "Dependencies totales: " + +#: cmdline/apt-cache.cc:300 +msgid "Total ver/file relations: " +msgstr "Relaciones versin/ficheru en total: " + +#: cmdline/apt-cache.cc:302 +msgid "Total Desc/File relations: " +msgstr "Relaciones descricin/ficheru en total: " + +#: cmdline/apt-cache.cc:304 +msgid "Total Provides mappings: " +msgstr "Mapes de provisiones en total: " + +#: cmdline/apt-cache.cc:316 +msgid "Total globbed strings: " +msgstr "Cadenes globalizaes en total: " + +#: cmdline/apt-cache.cc:330 +msgid "Total dependency version space: " +msgstr "Espaciu de dependencies de versin en total: " + +#: cmdline/apt-cache.cc:335 +msgid "Total slack space: " +msgstr "Espaciu ociosu en total: " + +#: cmdline/apt-cache.cc:343 +msgid "Total space accounted for: " +msgstr "Informe del total d'espaciu: " + +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#, c-format +msgid "Package file %s is out of sync." +msgstr "El ficheru de paquetes %s nun ta sincronizu." + +#: cmdline/apt-cache.cc:1293 +msgid "You must give exactly one pattern" +msgstr "Has de dar exautamente un patrn" + +#: cmdline/apt-cache.cc:1447 +msgid "No packages found" +msgstr "Nun s'alcontraron paquetes" + +#: cmdline/apt-cache.cc:1524 +msgid "Package files:" +msgstr "Ficheros de paquete:" + +#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "" +"La cach nun ta sincronizada, nun puede facese x-ref a un ficheru de paquete" + +#: cmdline/apt-cache.cc:1532 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1544 +msgid "Pinned packages:" +msgstr "Paquetes na chincheta:" + +#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +msgid "(not found)" +msgstr "(nun s'alcontr)" + +#. Installed version +#: cmdline/apt-cache.cc:1577 +msgid " Installed: " +msgstr " Instalu: " + +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +msgid "(none)" +msgstr "(dengn)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1584 +msgid " Candidate: " +msgstr " Candidatu: " + +#: cmdline/apt-cache.cc:1594 +msgid " Package pin: " +msgstr " Chincheta de paquetes: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1603 +msgid " Version table:" +msgstr " Tabla de versiones:" + +#: cmdline/apt-cache.cc:1618 +#, c-format +msgid " %4i %s\n" +msgstr " %4i %s\n" + +#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#, c-format +msgid "%s %s for %s compiled on %s %s\n" +msgstr "%s %s pa %s compilu en %s %s\n" + +#: cmdline/apt-cache.cc:1721 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Usu: apt-cache [opciones] orde\n" +" apt-cache [opciones] add ficheru1 [ficheru2 ...]\n" +" apt-cache [opciones] showpkg paq1 [paq2 ...]\n" +" apt-cache [opciones] showsrc paq1 [paq2 ...]\n" +"\n" +"apt-cache ye una ferramienta de baxu nivel usada pa remanar\n" +"ficheros de cach binarios d'APT y consultar informacin d'ellos\n" +"\n" +"Ordes:\n" +" add - Amesta un ficheru de paquete a la cach fonte\n" +" gencaches - Creal dambes cachs, la de paquetes y la de fontes\n" +" showpkg - Amuesa algo d'informacin xeneral d'un slu paquete\n" +" showsrc - Amuesa los rexistros de fonte\n" +" stats - Amuesa dalgunes estadstiques bsiques\n" +" dump - Amuesa'l ficheru ensembre en formatu tersu\n" +" dumpavail - Imprenta un ficheru disponible na salida estndar\n" +" unmet - Amuesa dependencies nun atopes\n" +" search - Restola na llista de paquetes por el patrn d'una espresin " +"regular\n" +" show - Amuesa un rexistru lleble pal paquete\n" +" depends - Amuesa la informacin de dependencies en bruto d'un paquete\n" +" rdepends - Amuesa la informacin de dependencies inverses d'un paquete\n" +" pkgnames - Llista los nomes de tolos paquetes nel sistema\n" +" dotty - Xenera grfiques del paquete pa GraphViz\n" +" xvcg - Xenera grfiques del paquete pa xvcg\n" +" policy - Amuesa los axustes de les normes\n" +"\n" +"Opciones:\n" +" -h Esti testu d'aida.\n" +" -p=? La cache de paquetes.\n" +" -s=? La cache de fontes.\n" +" -q Desactiva l'indicador de progresu.\n" +" -i Amuesa slo les dependencies importantes de la orde incumplida.\n" +" -c=? Lleer esti ficheru de configuracin\n" +" -o=? Consea una opcin de configuracin arbitraria, ex -o dir::cache=/" +"tmp\n" +"Ver les pxines del manual apt-cache(8) y apt.conf(5) pa ms informacin.\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Da-y un nome a esti discu, como 'Debian 2.1r1 Discu 1'" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Inxerta un discu nel presu y calca intro" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Repite'l procesu colos dems CDs del conxuntu." + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Argumentos non empareyaos" + +#: cmdline/apt-config.cc:76 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Usu: apt-config [opciones] orde\n" +"\n" +"apt-config ye una ferramienta pa lleer el ficheru de configuracin d'APT.\n" +"\n" +"Ordes:\n" +" shell - Mou shell\n" +" dump - Amuesa la configuracin\n" +"\n" +"Opciones:\n" +" -h Esti testu d'aida.\n" +" -c=? Llee esti ficheru de configuracin\n" +" -o=? Consea una opcin de configuracin arbitraria, p. ex.\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s nun ye un paquete DEB vlidu." + +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n" +"\n" +"apt-extracttemplates ye un presu pa sacar informacin de\n" +"configuracin y plantes de paquetes de debian.\n" +"\n" +"Opciones:\n" +"-h Esti testu d'aida.\n" +"-t Define'l direutoriu temporal\n" +"-c=? Llei esti ficheru de configuracin\n" +"-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 +#, c-format +msgid "Unable to write to %s" +msgstr "Nun se pue escribir en %s" + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Nun se pue alcontrar la versin de debconf. Ta instalu debconf?" + +#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +msgid "Package extension list is too long" +msgstr "La llista d'estensin de paquetes ye demasiao llarga" + +#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 +#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 +#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 +#, c-format +msgid "Error processing directory %s" +msgstr "Error al procesar el direutoriu %s" + +#: ftparchive/apt-ftparchive.cc:251 +msgid "Source extension list is too long" +msgstr "La llista d'estensin de fontes ye demasiao llarga" + +#: ftparchive/apt-ftparchive.cc:368 +msgid "Error writing header to contents file" +msgstr "Error al escribir la cabecera al ficheru de contenos" + +#: ftparchive/apt-ftparchive.cc:398 +#, c-format +msgid "Error processing contents %s" +msgstr "Error al procesar contenos %s" + +#: ftparchive/apt-ftparchive.cc:553 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Uso: apt-ftparchive [escoyetes] orde\n" +"Ordes: packages camin-binariu [ficheru-disvos [prefixu-camin]]\n" +" sources camin-fonte [ficheru-disvos [prefixu-camin]]\n" +" contents camin\n" +" release camin\n" +" generate config [grupos]\n" +" clean config\n" +"\n" +"apt-ftparchive xenera ndices p'archivos de Debian. Sofita dellos\n" +"estilos de xeneracin de reemplazos pa dpkg-scanpackages y\n" +"dpkg-scansources, dende los automatizos dafechu a los funcionales .\n" +"\n" +"apt-ftparchive xenera ficheros Package d'un rbol de .debs. El ficheru\n" +"Package tien los contenos de tolos campos de control de cada paquete,\n" +"neto que la suma MD5 y el tamau del ficheru. Puede usase un ficheru\n" +"de disvos pa forzar el valor de Priority y Section.\n" +"\n" +"De mou asemeyu, apt-ftparchive xenera ficheros Sources pa un rbol\n" +"de .dscs. Puede utilizase la opcin --source-override pa consear un\n" +"ficheru de disvu de fonte.\n" +"\n" +"Les ordes packages y sources han d'executase na raiz de l'rbol.\n" +"BinaryPath tien qu'apuntar a la base de la gueta recursiva, y el ficheru\n" +"de disvos tien que contener les marques de los disvos. El prefixu de\n" +"camn, si esiste, amstase a los campos de nome de ficheru. Darru,\n" +"un exemplu d'usu basu nos archivos de Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Escoyetes:\n" +" -h Esti testu d'aida\n" +" --md5 Xenerar control MD5 \n" +" -s=? Ficheru de disvu de fontes\n" +" -q Sele\n" +" -d=? Seleiciona la base de datos de cach opcional \n" +" --no-delink Activa'l mou de depuracin de desenllaces\n" +" --contents Xenerar ficheru de contenos de control\n" +" -c=? Lleer esti ficheru de configuracin\n" +" -o=? Afita una escoyeta de configuracin propia" + +#: ftparchive/apt-ftparchive.cc:759 +msgid "No selections matched" +msgstr "Nun concas denguna seleicin" + +#: ftparchive/apt-ftparchive.cc:832 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Falten dellos ficheros nel grupu de ficheros de paquete `%s'" + +#: ftparchive/cachedb.cc:43 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "La BD corrompiose, ficheru renomu como %s.old" + +#: ftparchive/cachedb.cc:61 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "La DB ye antigua, tentando actualizar %s" + +#: ftparchive/cachedb.cc:72 +msgid "" +"DB format is invalid. If you upgraded from a older version of apt, please " +"remove and re-create the database." +msgstr "" +"El formatu de la base de datos nun ye vlidu. Si anovaste dende una versin " +"anterior d'apt, desanicia y recrea la base de datos." + +#: ftparchive/cachedb.cc:77 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Nun pudo abrise'l ficheru de BD %s: %s" + +#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 +#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 +#, c-format +msgid "Failed to stat %s" +msgstr "Nun pudo lleese %s" + +#: ftparchive/cachedb.cc:238 +msgid "Archive has no control record" +msgstr "L'archivu nun tien rexistru de control" + +#: ftparchive/cachedb.cc:444 +msgid "Unable to get a cursor" +msgstr "Nun pudo algamase un cursor" + +#: ftparchive/writer.cc:76 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "A: Nun pudo lleese'l direutoriu %s\n" + +#: ftparchive/writer.cc:81 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "A: Nun pudo lleese %s\n" + +#: ftparchive/writer.cc:132 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:134 +msgid "W: " +msgstr "A: " + +#: ftparchive/writer.cc:141 +msgid "E: Errors apply to file " +msgstr "E: Errores aplicables al ficheru " + +#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#, c-format +msgid "Failed to resolve %s" +msgstr "Nun pudo resolvese %s" + +#: ftparchive/writer.cc:170 +msgid "Tree walking failed" +msgstr "Fall'l percorru pol rbol" + +#: ftparchive/writer.cc:195 +#, c-format +msgid "Failed to open %s" +msgstr "Nun pudo abrise %s" + +#: ftparchive/writer.cc:254 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " Desenllazar %s [%s]\n" + +#: ftparchive/writer.cc:262 +#, c-format +msgid "Failed to readlink %s" +msgstr "Nun pudo lleese l'enllaz %s" + +#: ftparchive/writer.cc:266 +#, c-format +msgid "Failed to unlink %s" +msgstr "Nun pudo desenllazase %s" + +#: ftparchive/writer.cc:273 +#, fuzzy, c-format +#| msgid "Failed to rename %s to %s" +msgid "*** Failed to link %s to %s" +msgstr "Nun pudo renomase %s como %s" + +#: ftparchive/writer.cc:283 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " Alcanzose'l llmite of %sB de desenllaz.\n" + +#: ftparchive/writer.cc:387 +msgid "Archive had no package field" +msgstr "L'archivu nun tien el campu paquetes" + +#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s nun tien la entrada saltos\n" + +#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " el curiador de %s ye %s y non %s\n" + +#: ftparchive/writer.cc:620 +#, c-format +msgid " %s has no source override entry\n" +msgstr " %s nun tien la entrada saltos de fonte\n" + +#: ftparchive/writer.cc:624 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" + +#: ftparchive/contents.cc:321 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Error internu, nun se pue atopar el miembru %s" + +#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Nun pudo allugase memoria" + +#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "Nun pudo abrise %s" + +#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "Saltu mal formu %s llinia %lu #1" + +#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "Saltu mal formu %s llinia %lu #2" + +#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "Saltu mal formu %s llinia %lu #3" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Nun pudo lleese'l ficheru de saltos %s" + +#: ftparchive/multicompress.cc:72 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Algoritmu de compresin desconocu '%s'" + +#: ftparchive/multicompress.cc:102 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "La salida comprimida %s necesita un xuegu de compresin" + +#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Fall criar un tubu IPC al soprocesu" + +#: ftparchive/multicompress.cc:195 +msgid "Failed to create FILE*" +msgstr "Nun pudo criase FICHERU*" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to fork" +msgstr "Nun pudo biforcase" + +#: ftparchive/multicompress.cc:212 +msgid "Compress child" +msgstr "Comprimir fu" + +#: ftparchive/multicompress.cc:235 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Error internu, nun pudo criase %s" + +#: ftparchive/multicompress.cc:286 +msgid "Failed to create subprocess IPC" +msgstr "Nun pudo criase'l soprocesu IPC" + +#: ftparchive/multicompress.cc:321 +msgid "Failed to exec compressor " +msgstr "Nun pudo executase'l compresor " + +#: ftparchive/multicompress.cc:360 +msgid "decompressor" +msgstr "descompresor" + +#: ftparchive/multicompress.cc:403 +msgid "IO to subprocess/file failed" +msgstr "Fallu na ES al soprocesu/ficheru" + +#: ftparchive/multicompress.cc:455 +msgid "Failed to read while computing MD5" +msgstr "Nun pudo lleese al computar MD5" + +#: ftparchive/multicompress.cc:472 +#, c-format +msgid "Problem unlinking %s" +msgstr "Problema al desenllazar %s" + +#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Nun pudo renomase %s como %s" + +#: cmdline/apt-get.cc:124 +msgid "Y" +msgstr "S" + +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Error de compilacin d'espresin regular - %s" + +#: cmdline/apt-get.cc:241 +msgid "The following packages have unmet dependencies:" +msgstr "Los siguientes paquetes nun cumplen dependencies:" + +#: cmdline/apt-get.cc:331 +#, c-format +msgid "but %s is installed" +msgstr "pero %s ta instalu" + +#: cmdline/apt-get.cc:333 +#, c-format +msgid "but %s is to be installed" +msgstr "pero %s ta pa instalar" + +#: cmdline/apt-get.cc:340 +msgid "but it is not installable" +msgstr "pero nun ye instalable" + +#: cmdline/apt-get.cc:342 +msgid "but it is a virtual package" +msgstr "pero ye un paquete virtual" + +#: cmdline/apt-get.cc:345 +msgid "but it is not installed" +msgstr "pero nun ta instalu" + +#: cmdline/apt-get.cc:345 +msgid "but it is not going to be installed" +msgstr "pero nun va instalase" + +#: cmdline/apt-get.cc:350 +msgid " or" +msgstr " o" + +#: cmdline/apt-get.cc:379 +msgid "The following NEW packages will be installed:" +msgstr "Van instalase los siguientes paquetes NUEVOS:" + +#: cmdline/apt-get.cc:405 +msgid "The following packages will be REMOVED:" +msgstr "Los siguientes paquetes van DESANICIASE:" + +#: cmdline/apt-get.cc:427 +msgid "The following packages have been kept back:" +msgstr "Los siguientes paquetes tan retenos:" + +#: cmdline/apt-get.cc:448 +msgid "The following packages will be upgraded:" +msgstr "Los siguientes paquetes van actualizase:" + +#: cmdline/apt-get.cc:469 +msgid "The following packages will be DOWNGRADED:" +msgstr "Los siguientes paquetes van DESACTUALIZASE:" + +#: cmdline/apt-get.cc:489 +msgid "The following held packages will be changed:" +msgstr "Van camudase los siguientes paquetes retenos:" + +#: cmdline/apt-get.cc:542 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (por %s) " + +#: cmdline/apt-get.cc:550 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"AVISU: Los siguientes paquetes esenciales van desaniciase.\n" +"Esto NUN hai que facelo si nun sabes esautamente lo que faes!" + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu actualizaos, %lu nuevos instalaos, " + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu reinstalaos, " + +#: cmdline/apt-get.cc:587 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu desactualizaos, " + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu para desaniciar y %lu nun actualizaos.\n" + +#: cmdline/apt-get.cc:593 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu nun instalaos dafechu o desaniciaos.\n" + +#: cmdline/apt-get.cc:667 +msgid "Correcting dependencies..." +msgstr "Iguando dependencies..." + +#: cmdline/apt-get.cc:670 +msgid " failed." +msgstr " fall." + +#: cmdline/apt-get.cc:673 +msgid "Unable to correct dependencies" +msgstr "Nun pudieron iguase les dependencies" + +#: cmdline/apt-get.cc:676 +msgid "Unable to minimize the upgrade set" +msgstr "Nun pue amenorgase'l conxuntu d'actualizacin" + +#: cmdline/apt-get.cc:678 +msgid " Done" +msgstr " Fecho" + +#: cmdline/apt-get.cc:682 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "Habres d'executar `apt-get -f install' para igualo." + +#: cmdline/apt-get.cc:685 +msgid "Unmet dependencies. Try using -f." +msgstr "Dependencies incumples. Tntalo usando -f." + +#: cmdline/apt-get.cc:707 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "AVISU: Nun pudieron autenticase los siguientes paquetes!" + +#: cmdline/apt-get.cc:711 +msgid "Authentication warning overridden.\n" +msgstr "Avisu d'autenticacin saltu.\n" + +#: cmdline/apt-get.cc:718 +msgid "Install these packages without verification [y/N]? " +msgstr "Instalar esos paquetes ensin verificacin [s/N]? " + +#: cmdline/apt-get.cc:720 +msgid "Some packages could not be authenticated" +msgstr "Dellos paquetes nun pudieron autenticase" + +#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +msgid "There are problems and -y was used without --force-yes" +msgstr "Hai problemes y utilizose -y ensin --force-yes" + +#: cmdline/apt-get.cc:773 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Error internu, InstallPackages llamose con paquetes fraaos!" + +#: cmdline/apt-get.cc:782 +msgid "Packages need to be removed but remove is disabled." +msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgu." + +#: cmdline/apt-get.cc:793 +msgid "Internal error, Ordering didn't finish" +msgstr "Error internu, ordenar nun fin" + +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 +msgid "Unable to lock the download directory" +msgstr "Nun pue bloquiase'l direutoriu de descarga" + +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 +#: apt-pkg/cachefile.cc:65 +msgid "The list of sources could not be read." +msgstr "Nun pudo lleese la llista de fontes." + +#: cmdline/apt-get.cc:834 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "Que raro.. Los tamaos nun concasen, escribe a apt@packages.debian.org" + +#: cmdline/apt-get.cc:839 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Hai que descargar %sB/%sB d'archivos.\n" + +#: cmdline/apt-get.cc:842 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Hai que descargar %sB d'archivos.\n" + +#: cmdline/apt-get.cc:847 +#, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Tres d'esta operacin, van usase %sB d'espaciu de discu adicional.\n" + +#: cmdline/apt-get.cc:850 +#, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n" + +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "Nun pue determinase l'espaciu llibre de %s" + +#: cmdline/apt-get.cc:871 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Nun tienes espaciu libre bastante en %s." + +#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Conseose Trivial Only pero sta nun ye una operacin trivial." + +#: cmdline/apt-get.cc:889 +msgid "Yes, do as I say!" +msgstr "S, facer lo que digo!" + +#: cmdline/apt-get.cc:891 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Tas a piques de facer daqu potencialmente daible.\n" +"Pa continuar escribe la frase '%s'\n" +" ?] " + +#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +msgid "Abort." +msgstr "Encaboxar." + +#: cmdline/apt-get.cc:912 +msgid "Do you want to continue [Y/n]? " +msgstr "Quies continuar [S/n]? " + +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Fall algamar %s %s\n" + +#: cmdline/apt-get.cc:1002 +msgid "Some files failed to download" +msgstr "Dellos ficheros nun pudieron descargase" + +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +msgid "Download complete and in download only mode" +msgstr "Descarga completa y en mou de slo descarga" + +#: cmdline/apt-get.cc:1009 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Nun pudieron algamase dellos archivos, seique executando apt-get update o " +"tentando --fix-missing?" + +#: cmdline/apt-get.cc:1013 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "--fix-missing y cambu de mediu nun ta sofitao actualmente" + +#: cmdline/apt-get.cc:1018 +msgid "Unable to correct missing packages." +msgstr "Nun pudieron iguase los paquetes que falten." + +#: cmdline/apt-get.cc:1019 +msgid "Aborting install." +msgstr "Encaboxando la instalacin." + +#: cmdline/apt-get.cc:1053 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "Nota, escoyendo %s nel llugar de %s\n" + +#: cmdline/apt-get.cc:1063 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Saltando %s, ya ta instalau y la actualizacin nun ta activada.\n" + +#: cmdline/apt-get.cc:1081 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" + +#: cmdline/apt-get.cc:1092 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "El paquete %s ye un paquete virtual ufru por:\n" + +#: cmdline/apt-get.cc:1104 +msgid " [Installed]" +msgstr " [Instalu]" + +#: cmdline/apt-get.cc:1109 +msgid "You should explicitly select one to install." +msgstr "Has d'escoyer esplcitamente unu pa instalar." + +#: cmdline/apt-get.cc:1114 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"El paquete %s nun ta disponible, otru paquete refierse a l.\n" +"Esto puede significar que falta el paquete, ta arrumbu, o slo\n" +"ta disponible dende otra fonte\n" + +#: cmdline/apt-get.cc:1133 +msgid "However the following packages replace it:" +msgstr "Sicas, los siguientes paquetes reemplacenlu:" + +#: cmdline/apt-get.cc:1136 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "El paquete %s nun tien candidatu pa instalacin" + +#: cmdline/apt-get.cc:1156 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "La reinstalacin de %s nun ye dable, nun pue descargase.\n" + +#: cmdline/apt-get.cc:1164 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s y ta na versin ms nueva.\n" + +#: cmdline/apt-get.cc:1193 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Nun s'alcontr la distribucin '%s' pa '%s'" + +#: cmdline/apt-get.cc:1195 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Nun s'alcontr la versin '%s' pa '%s'" + +#: cmdline/apt-get.cc:1201 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "Escoyida la versin %s (%s) pa %s\n" + +#: cmdline/apt-get.cc:1338 +msgid "The update command takes no arguments" +msgstr "La orde update nun lleva argumentos" + +#: cmdline/apt-get.cc:1351 +msgid "Unable to lock the list directory" +msgstr "Nun pudo bloquiase'l direutoriu de llista" + +#: cmdline/apt-get.cc:1403 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" + +#: cmdline/apt-get.cc:1435 +msgid "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr "" +"Los siguientes paquetes instalaronse de manera automtica y ya nun se " +"necesiten:" + +#: cmdline/apt-get.cc:1437 +msgid "Use 'apt-get autoremove' to remove them." +msgstr "Usa 'apt-get autoremove' pa desinstalalos." + +#: cmdline/apt-get.cc:1442 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" +"Hmm, paez que AutoRemover destruy daqu, lo que nun tendra\n" +"por qu pasar. Por favor, unva un informe de fallu escontra apt." + +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << endl; +#. } +#. +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +msgid "The following information may help to resolve the situation:" +msgstr "La siguiente informacin pue aidar a resolver la situacin:" + +#: cmdline/apt-get.cc:1449 +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Error internu, AutoRemover rompi coses" + +#: cmdline/apt-get.cc:1468 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "Error internu, AllUpgrade rompi coses" + +#: cmdline/apt-get.cc:1523 +#, c-format +msgid "Couldn't find task %s" +msgstr "Nun pudo alcontrase la tarea %s" + +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#, c-format +msgid "Couldn't find package %s" +msgstr "Nun pudo alcontrase'l paquete %s" + +#: cmdline/apt-get.cc:1661 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n" + +#: cmdline/apt-get.cc:1692 +#, c-format +msgid "%s set to manually installed.\n" +msgstr "%s axustu como instalu manualmente.\n" + +#: cmdline/apt-get.cc:1705 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "Habres d'executar `apt-get -f install' para iguar estos:" + +#: cmdline/apt-get.cc:1708 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " +"consea una solucin)." + +#: cmdline/apt-get.cc:1720 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Dellos paquetes nun pudieron instalase. Esto puede significar que\n" +"conseaste una situacin imposible o, si tas usando la distribucin\n" +"inestable, que dellos paquetes necesarios nun se crearon o que\n" +"s'allugaron fuera d'Incoming." + +#: cmdline/apt-get.cc:1738 +msgid "Broken packages" +msgstr "Paquetes fraaos" + +#: cmdline/apt-get.cc:1767 +msgid "The following extra packages will be installed:" +msgstr "Instalarnse los siguientes paquetes extra:" + +#: cmdline/apt-get.cc:1856 +msgid "Suggested packages:" +msgstr "Paquetes afalaos:" + +#: cmdline/apt-get.cc:1857 +msgid "Recommended packages:" +msgstr "Paquetes encamentaos" + +#: cmdline/apt-get.cc:1885 +msgid "Calculating upgrade... " +msgstr "Calculando l'autualizacin... " + +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +msgid "Failed" +msgstr "Fall" + +#: cmdline/apt-get.cc:1893 +msgid "Done" +msgstr "Fecho" + +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +msgid "Internal error, problem resolver broke stuff" +msgstr "Error internu, l'iguador de problemes fra coses" + +#: cmdline/apt-get.cc:2068 +msgid "Must specify at least one package to fetch source for" +msgstr "Has de consear polo menos un paquete p'algamar so fonte" + +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Nun pudo alcontrase un paquete fonte pa %s" + +#: cmdline/apt-get.cc:2147 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Saltando'l ficheru y descargu '%s'\n" + +#: cmdline/apt-get.cc:2175 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "Nun hai espaciu llibre bastante en %s" + +#: cmdline/apt-get.cc:2181 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" + +#: cmdline/apt-get.cc:2184 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Hai falta descargar %sB d'archivos fonte.\n" + +#: cmdline/apt-get.cc:2190 +#, c-format +msgid "Fetch source %s\n" +msgstr "Fonte descargada %s\n" + +#: cmdline/apt-get.cc:2221 +msgid "Failed to fetch some archives." +msgstr "Fall la descarga de dellos archivos." + +#: cmdline/apt-get.cc:2249 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n" + +#: cmdline/apt-get.cc:2261 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Fall la orde de desempaquetu '%s'.\n" + +#: cmdline/apt-get.cc:2262 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n" + +#: cmdline/apt-get.cc:2279 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Fall la orde build '%s'.\n" + +#: cmdline/apt-get.cc:2298 +msgid "Child process failed" +msgstr "Fall el procesu fu" + +#: cmdline/apt-get.cc:2314 +msgid "Must specify at least one package to check builddeps for" +msgstr "" +"Hai que consear polo menos un paquete pa verificar les dependencies de " +"construccin" + +#: cmdline/apt-get.cc:2342 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s" + +#: cmdline/apt-get.cc:2362 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s nun tien dependencies de construccin.\n" + +#: cmdline/apt-get.cc:2414 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " +"paquete %s" + +#: cmdline/apt-get.cc:2467 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"La dependencia %s en %s nun puede satisfacese porque denguna versin " +"disponible del paquete %s satisfaz los requisitos de versin" + +#: cmdline/apt-get.cc:2503 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" +"Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalu %s ye " +"demasiao nuevu" + +#: cmdline/apt-get.cc:2528 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" + +#: cmdline/apt-get.cc:2542 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "Les dependencies de construccin de %s nun pudieron satisfacese." + +#: cmdline/apt-get.cc:2546 +msgid "Failed to process build dependencies" +msgstr "Fallu al procesar les dependencies de construccin" + +#: cmdline/apt-get.cc:2578 +msgid "Supported modules:" +msgstr "Mdulos sofitaos:" + +#: cmdline/apt-get.cc:2619 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove automatically all unused packages\n" +" purge - Remove and purge packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to correct a system with broken dependencies in place\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Usu: apt-get [opciones] comandu\n" +" apt-get [opciones] install|remove pkg1 [pkg2 ...]\n" +" apt-get [opciones] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get ye una interface de llnia de comandos simple pa baxar ya\n" +"instalar paquetes. L'usu ms frecuente de comandos ye p'anovar\n" +"ya instalar.\n" +"\n" +"Comandos:\n" +" update - Algamar nueva llista de paquetes\n" +" upgrade - Facer una actualizacin\n" +" install - Instalar nuevos paquetes (pkg ye libc6 no libc6.deb)\n" +" remove - Desaniciar paquetes\n" +" autoremove - Desaniciar automticamente tolos paquetes non usaos\n" +" purge - Quitar y desaniciar paquetes\n" +" source - Baxar fonte del archivu\n" +" build-dep - Configurar dependencies pa los paquetes fonte\n" +" dist-upgrade - Actualizacin de la distribucin, ver apt-get(8)\n" +" dselect-upgrade - Siguir seleiciones dselect\n" +" clean - Esborrar los ficheros de ficheros baxaos\n" +" autoclean - Esborrar ficheros de ficheros vieyos baxaos\n" +" check - Verificar que nun hai dependencies frayaes\n" +"\n" +"Opciones:\n" +" -h Esti testu d'aida.\n" +" -q Salida Log - ensn indicacin de progresu\n" +" -qq Ensn salida excepto pa fallos\n" +" -d Baxar slo - NON instalar o desempaquetar los archivos\n" +" -s No aicin. Facer una simulacin ordenada\n" +" -y Asumir Yes pa toles entruges y nun visualizar la peticin\n" +" -f Intentar correxir un sistema con dependencies frayaes\n" +" -m Intentar siguir si los archivos nun tan disponibles\n" +" -u Amosar una lilsta de paquetes que tan bien\n" +" -b Facer el paquete fonte dempues d'algamalu\n" +" -V Amosar nmberos de versiones\n" +" -c=? Lleer esti ficheru de configuracin\n" +" -o=? Afitar una opcin de configuracin arbitraria, p. ex. -o dir::cache=/" +"tmp\n" +"Ver ls pxines de los manuales d' apt-get(8), sources.list(5) y apt.conf" +"(5)\n" +"pa ms informacin y opciones.\n" +" Esti APT tien Poderes de Super Vaca.\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "Oxe " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Des:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Ign " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Err " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Descargaos %sB en %s (%sB/s)\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr " [Tresnando]" + +#: cmdline/acqprogress.cc:271 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Cambeu de mediu: Por favor meti'l discu etiquetu\n" +" '%s'\n" +"na unid '%s' y calca Intro\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Rexistru de paquetes desconocu!" + +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Usu: apt-sortpkgs [opciones] ficheru1 [ficheru2 ...]\n" +"\n" +"apt-sortpkgs ye un presu cenciellu pa tresnar ficheros de paquetes.\n" +"La opcin -s sase pa indicar qu triba de ficheru ye.\n" +"\n" +"Opciones:\n" +"-h Esti testu d'aida.\n" +"-s Usa ordenamientu de ficheros fonte\n" +"-c=? Llei esti ficheru de configuracin\n" +"-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::\n" +"cache=/tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Mal axuste por omisin!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 +msgid "Press enter to continue." +msgstr "Calca Intro pa continuar." + +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "Quies desaniciar los ficheros .deb descargaos previamente?" + +#: dselect/install:101 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "Ocurrieron dellos errores al desempaquetar. Va configurarse'l" + +#: dselect/install:102 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "paquetes que s'instalaron. Esto pue causar errores duplicaos" + +#: dselect/install:103 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "" +"o fallos causaos por dependencies que nun tn. Esto ta BIEN, slo los fallos" + +#: dselect/install:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"enriba d'esti mensaxe son importante. Por favor, guales y executa [I]nstall " +"otra vuelta" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Fusionando informacin disponible" + +#: apt-inst/contrib/extracttar.cc:114 +msgid "Failed to create pipes" +msgstr "Fallu al crear les tuberes" + +#: apt-inst/contrib/extracttar.cc:141 +msgid "Failed to exec gzip " +msgstr "Fallu al executar gzip " + +#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 +msgid "Corrupted archive" +msgstr "Ficheru tollu" + +#: apt-inst/contrib/extracttar.cc:193 +msgid "Tar checksum failed, archive corrupted" +msgstr "Fall la suma de control de tar, ficheru tollu" + +#: apt-inst/contrib/extracttar.cc:296 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Testera del TAR triba %u desconocida, miembru %s" + +#: apt-inst/contrib/arfile.cc:70 +msgid "Invalid archive signature" +msgstr "Robla del ficheru invlida" + +#: apt-inst/contrib/arfile.cc:78 +msgid "Error reading archive member header" +msgstr "Fallu al lleer la testera de miembru del ficheru" + +#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +msgid "Invalid archive member header" +msgstr "Testera de miembur del ficheru invlida" + +#: apt-inst/contrib/arfile.cc:128 +msgid "Archive is too short" +msgstr "El ficheru ye perpequeu" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Failed to read the archive headers" +msgstr "Fall al lleer les testeres del ficheru" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Llamse a DropNode nun nodu que ta ent enllazu" + +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Fallu al atopar l'elementu enllazu!" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Fall al allugar una desvu" + +#: apt-inst/filelist.cc:464 +msgid "Internal error in AddDiversion" +msgstr "Fallu internu en AddDiversion" + +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Intentando sobrescribir un desvu, %s -> %s and %s/%s" + +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Doble suma de desvu %s -> %s" + +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Ficheru de configuracin duplicu %s/%s" + +#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 +#, c-format +msgid "Failed to write file %s" +msgstr "Fall la escritura nel ficheru %s" + +#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 +#, c-format +msgid "Failed to close file %s" +msgstr "Fall al pesllar el ficheru %s" + +#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 +#, c-format +msgid "The path %s is too long" +msgstr "La trayeutoria %s ye demasiao llarga" + +#: apt-inst/extract.cc:124 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Desempaquetando %s ms d'una vegada" + +#: apt-inst/extract.cc:134 +#, c-format +msgid "The directory %s is diverted" +msgstr "El direutorio %s ta desviu" + +#: apt-inst/extract.cc:144 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "El paquete ta tentando escribir nel oxetivu desviu %s/%s" + +#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 +msgid "The diversion path is too long" +msgstr "La trayeutoria de desviacin ye demasiao llarga" + +#: apt-inst/extract.cc:240 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "El direutoriu %s ta reemplazndose por un non-direutoriu" + +#: apt-inst/extract.cc:280 +msgid "Failed to locate node in its hash bucket" +msgstr "Fallu al atopar el nodu nel so bote d'enllaz" + +#: apt-inst/extract.cc:284 +msgid "The path is too long" +msgstr "La trayeutoria ye perllarga" + +#: apt-inst/extract.cc:414 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Sobreescribiendo concordancia del paquete ensin versin pa %s" + +#: apt-inst/extract.cc:431 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" + +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#, c-format +msgid "Unable to read %s" +msgstr "Nun ye a lleer %s" + +#: apt-inst/extract.cc:491 +#, c-format +msgid "Unable to stat %s" +msgstr "Nun ye a lleer %s" + +#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 +#, c-format +msgid "Failed to remove %s" +msgstr "Nun ye a desaniciar %s" + +#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 +#, c-format +msgid "Unable to create %s" +msgstr "Nun ye a crear %s" + +#: apt-inst/deb/dpkgdb.cc:114 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "Nun ye a lleer %s" + +#: apt-inst/deb/dpkgdb.cc:119 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "" +"Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros" + +#. Build the status cache +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760 +#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834 +#: apt-pkg/pkgcachegen.cc:957 +msgid "Reading package lists" +msgstr "Lleendo llista de paquetes" + +#: apt-inst/deb/dpkgdb.cc:176 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "Fallu al camudar al direutoriu d'alministracin %sinfo" + +#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 +#: apt-inst/deb/dpkgdb.cc:444 +msgid "Internal error getting a package name" +msgstr "Fallu internu al obtener un Nome de Paquete" + +#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 +msgid "Reading file listing" +msgstr "Lleendo llistu de ficheros" + +#: apt-inst/deb/dpkgdb.cc:212 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" +"Nun pude abrir el ficheru de llista '%sinfo/%s'. Si nun yes a restablecer " +"esti ficheru ents crea n baleru y darru reinstala la mesma versin del " +"paquete!" + +#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "Fallu al lleer el ficheru de llista %sinfo/%s" + +#: apt-inst/deb/dpkgdb.cc:262 +msgid "Internal error getting a node" +msgstr "Fallu internu al obtener un nodu" + +#: apt-inst/deb/dpkgdb.cc:305 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "Fallu al abrir el ficheru de desviacin %sdiversions" + +#: apt-inst/deb/dpkgdb.cc:320 +msgid "The diversion file is corrupted" +msgstr "El ficheru de desviacin ta tollu" + +#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 +#: apt-inst/deb/dpkgdb.cc:337 +#, c-format +msgid "Invalid line in the diversion file: %s" +msgstr "Llinia invlida nel ficheru de desviacin: %s" + +#: apt-inst/deb/dpkgdb.cc:358 +msgid "Internal error adding a diversion" +msgstr "Fallu internu al amestar una desviacin" + +#: apt-inst/deb/dpkgdb.cc:379 +msgid "The pkg cache must be initialized first" +msgstr "El cach del paquete tien d'entamase primero" + +#: apt-inst/deb/dpkgdb.cc:439 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "Fallu al atopar un paquete: Testera, desplazamientu %lu" + +#: apt-inst/deb/dpkgdb.cc:461 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "Estaya mala del ConfFile nel ficheru d'estau. Desplazamientu %lu" + +#: apt-inst/deb/dpkgdb.cc:466 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "Fallu al lleer Md5. Desplazamientu %lu" + +#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Esti nun ye un ficheru DEB vlidu, falta'l miembru '%s'" + +#: apt-inst/deb/debfile.cc:50 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Esti nun ye un ficheru DEB vlidu, falta'l miembru '%s', '%s' o '%s'" + +#: apt-inst/deb/debfile.cc:110 +#, c-format +msgid "Couldn't change to %s" +msgstr "Nun fui a camudar a %s" + +#: apt-inst/deb/debfile.cc:140 +msgid "Internal error, could not locate member" +msgstr "Fallu internu, nun fui a atopar el miembru" + +#: apt-inst/deb/debfile.cc:173 +msgid "Failed to locate a valid control file" +msgstr "Nun fui a atopar un ficheru de control vlidu" + +#: apt-inst/deb/debfile.cc:258 +msgid "Unparsable control file" +msgstr "Ficheru de control inanalizable" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Nun se pudo lleer la base datos %s del CD-ROM" + +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Por favor usa apt-cdrom pa facer qu'APT reconoza esti CD. apt-get update nun " +"se puede usar p'amestar CDs nuevos" + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "CD-ROM malu" + +#: methods/cdrom.cc:166 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Nun se pudo desmontar el CD-ROM de %s; puede que se tea usando ent." + +#: methods/cdrom.cc:171 +msgid "Disk not found." +msgstr "Nun s'atopa'l discu." + +#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "Nun s'atopa'l ficheru." + +#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 +#: methods/rred.cc:234 methods/rred.cc:243 +msgid "Failed to stat" +msgstr "Fall al lleer" + +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +msgid "Failed to set modification time" +msgstr "Nun se pudo afitar la hora de modificacin" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "URI malu, los URIS llocales nun pueden entamar por //" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Entrando" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "Nun se pudo determinar el nome del par" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "Nun se pudo determinar el nome llocal" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "El sirvidor refug la conexn, y dixo: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "L'usuariu (USER) fall; el sirvidor dixo: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "La contrasea (PASS) fall; el sirvidor dixo: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Especificse un sirvidor proxy pero non un script d'entrada, Acquire::ftp::" +"ProxyLogin ta baleru." + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Fall la orde '%s' del guin d'entrada; el sirvidor dixo: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "La triba (TYPE) fall; el sirvidor dixo: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Gandi'l tiempu de conexn" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "El sirvidor zarr la conexn" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 +msgid "Read error" +msgstr "Fallu de llectura" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "Una rempuesta revirti'l buffer." + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "Corrupcin del protocolu" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 +msgid "Write error" +msgstr "Fallu d'escritura" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "Nun se pudo crear un socket" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "Nun se pudo coneutar el zcalu de datos; gandi'l tiempu de conexn" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "Nun se pudo coneutar un socket pasivu." + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo nun pudo obtener un zcalu oyente" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "Nun se pudo enllazar con un socket" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "Nun se pudo escuchar nel socket" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "Nun se pudo determinar el nome del socket" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "Nun se pudo mandar la orde PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Direicin de familia %u desconocida (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT fall; el sirvidor dixo: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "Gandi'l tiempu de conexn col zcalu de datos" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "Nun se pudo aceptar la conexn" + +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "Hebo un problema al xenerar el hash del ficheru" + +#: methods/ftp.cc:877 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "Nun se pudo descargar el ficheru; el sirvidor dixo '%s'" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "Gandi'l tiempu del zcalu de datos" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "Fall la tresferencia de datos; el sirvidor dixo '%s'" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Consulta" + +#: methods/ftp.cc:1109 +msgid "Unable to invoke " +msgstr "Nun se pudo invocar " + +#: methods/connect.cc:70 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Coneutando a %s (%s)" + +#: methods/connect.cc:81 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" + +#: methods/connect.cc:90 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "Nun se pudo crear un socket pa %s (f=%u t=%u p=%u)" + +#: methods/connect.cc:96 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Nun se pudo coneutar a %s:%s (%s)." + +#: methods/connect.cc:104 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Nun se pudo coneutar a %s:%s (%s); expir'l tiempu de conexn" + +#: methods/connect.cc:119 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Nun se pudo coneutar a %s:%s (%s)." + +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:147 methods/rsh.cc:425 +#, c-format +msgid "Connecting to %s" +msgstr "Coneutando a %s" + +#: methods/connect.cc:165 methods/connect.cc:184 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Nun se pudo resolver '%s'" + +#: methods/connect.cc:190 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Fallu temporal al resolver '%s'" + +#: methods/connect.cc:193 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "Daqu raru pas resolviendo '%s:%s' (%i)" + +#: methods/connect.cc:240 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "Nun se pudo coneutar a %s %s:" + +#: methods/gpgv.cc:65 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nun se pudo acceder al aniellu de claves '%s'" + +#: methods/gpgv.cc:101 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" +"E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando." + +#: methods/gpgv.cc:205 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" +"Fallu internu: Robla bona, pero nun se pudo determinar la so gella dixital?!" + +#: methods/gpgv.cc:210 +msgid "At least one invalid signature was encountered." +msgstr "Atopse polo menos una robla mala." + +#: methods/gpgv.cc:214 +#, c-format +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +msgstr "Nun se pudo executar '%s' pa verificar la robla (ta instalu gpgv?)" + +#: methods/gpgv.cc:219 +msgid "Unknown error executing gpgv" +msgstr "Fallu desconocu al executar gpgv" + +#: methods/gpgv.cc:250 +msgid "The following signatures were invalid:\n" +msgstr "Les siguientes robles nun valieron:\n" + +#: methods/gpgv.cc:257 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Les robles siguiente nun se pudieron verificar porque la to llave pblica " +"nun ta a mano:\n" + +#: methods/gzip.cc:64 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "Nun se pudo abrir una tubera pa %s" + +#: methods/gzip.cc:109 +#, c-format +msgid "Read error from %s process" +msgstr "Fallu de llectura dende'l procesu %s" + +#: methods/http.cc:377 +msgid "Waiting for headers" +msgstr "Esperando les testeres" + +#: methods/http.cc:523 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "Obtvose una sola llinia de testera penriba de %u carauteres" + +#: methods/http.cc:531 +msgid "Bad header line" +msgstr "Fallu na llinia testera" + +#: methods/http.cc:550 methods/http.cc:557 +msgid "The HTTP server sent an invalid reply header" +msgstr "El sirvidor HTTP mand una testera incorreuta de rempuesta" + +#: methods/http.cc:586 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "El sirvidor HTTP mand una testera incorreuta de Content-Length" + +#: methods/http.cc:601 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "El sirvidor HTTP mand una testera incorreuta de Content-Range" + +#: methods/http.cc:603 +msgid "This HTTP server has broken range support" +msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" + +#: methods/http.cc:627 +msgid "Unknown date format" +msgstr "Formatu de data desconocu" + +#: methods/http.cc:774 +msgid "Select failed" +msgstr "Fall la escoyeta" + +#: methods/http.cc:779 +msgid "Connection timed out" +msgstr "Gandi'l tiempu de conexn" + +#: methods/http.cc:802 +msgid "Error writing to output file" +msgstr "Fallu al escribir nel ficheru de salida" + +#: methods/http.cc:833 +msgid "Error writing to file" +msgstr "Fallu al escribir nel ficheru" + +#: methods/http.cc:861 +msgid "Error writing to the file" +msgstr "Fallu al escribir nel ficheru" + +#: methods/http.cc:875 +msgid "Error reading from server. Remote end closed connection" +msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn." + +#: methods/http.cc:877 +msgid "Error reading from server" +msgstr "Fallu al lleer nel sirvidor" + +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +msgid "Failed to truncate file" +msgstr "Fall al francer el ficheru" + +#: methods/http.cc:1105 +msgid "Bad header data" +msgstr "Datos de testera incorreutos" + +#: methods/http.cc:1122 methods/http.cc:1177 +msgid "Connection failed" +msgstr "Fallo la conexn" + +#: methods/http.cc:1229 +msgid "Internal error" +msgstr "Fallu internu" + +#: apt-pkg/contrib/mmap.cc:80 +msgid "Can't mmap an empty file" +msgstr "Nun se puede facer mmap d'un ficheru baleru" + +#: apt-pkg/contrib/mmap.cc:85 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Nun se pudo facer mmap de %lu bytes" + +#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" +"Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau de APT::Cache-" +"Limit. El valor actual ye : %lu. (man 5 apt.conf)" + +#: apt-pkg/contrib/strutl.cc:1014 +#, c-format +msgid "Selection %s not found" +msgstr "Escoyeta %s que nun s'atopa" + +#: apt-pkg/contrib/configuration.cc:439 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Triba d'abreviatura que nun se reconoz: %c" + +#: apt-pkg/contrib/configuration.cc:497 +#, c-format +msgid "Opening configuration file %s" +msgstr "Abriendo ficheros de configuracin %s" + +#: apt-pkg/contrib/configuration.cc:662 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque." + +#: apt-pkg/contrib/configuration.cc:681 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Fallu de sintaxis %s:%u: Marca mal formada" + +#: apt-pkg/contrib/configuration.cc:698 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempus del valor" + +#: apt-pkg/contrib/configuration.cc:738 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "" +"Error de sintaxis %s:%u: Les directives pueden facese slo nel nivel cimeru" + +#: apt-pkg/contrib/configuration.cc:745 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones aeraes" + +#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ" + +#: apt-pkg/contrib/configuration.cc:758 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" + +#: apt-pkg/contrib/configuration.cc:809 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru" + +#: apt-pkg/contrib/progress.cc:153 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Fallu!" + +#: apt-pkg/contrib/progress.cc:155 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Fecho" + +#: apt-pkg/contrib/cmndline.cc:77 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "La opcin de llinia d'ordes '%c' [de %s] ye desconocida." + +#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 +#: apt-pkg/contrib/cmndline.cc:119 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Nun s'entiende la opcin %s de la llinia d'ordes" + +#: apt-pkg/contrib/cmndline.cc:124 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "La opcin %s de la llinia d'ordes nun ye un valor booleanu" + +#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#, c-format +msgid "Option %s requires an argument." +msgstr "La opcin %s necesita un argumentu." + +#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#, c-format +msgid "Option %s: Configuration item specification must have an =." +msgstr "Opcin %s: L'axuste del elementu de configuracin ha tener un =." + +#: apt-pkg/contrib/cmndline.cc:234 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "La opcin %s pide un argumentu enteru, non '%s'" + +#: apt-pkg/contrib/cmndline.cc:265 +#, c-format +msgid "Option '%s' is too long" +msgstr "Opcin '%s' demasiao llarga" + +#: apt-pkg/contrib/cmndline.cc:298 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "El sentu %s nun s'entiende, prueba con braeru o falsu." + +#: apt-pkg/contrib/cmndline.cc:348 +#, c-format +msgid "Invalid operation %s" +msgstr "Operacin incorreuta: %s" + +#: apt-pkg/contrib/cdromutl.cc:52 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Nun puede algamase informacin del puntu de montaxe %s" + +#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 +#, c-format +msgid "Unable to change to %s" +msgstr "Nun se pudo cambiar a %s" + +#: apt-pkg/contrib/cdromutl.cc:188 +msgid "Failed to stat the cdrom" +msgstr "Nun se pudo montar el CD-ROM" + +#: apt-pkg/contrib/fileutl.cc:149 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "Nun ta usndose bloquu pal ficheru de bloquu de slo llectura %s" + +#: apt-pkg/contrib/fileutl.cc:154 +#, c-format +msgid "Could not open lock file %s" +msgstr "Nun puede abrise'l ficheru de bloquu %s" + +#: apt-pkg/contrib/fileutl.cc:172 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "Nun ta usndose bloquu pal ficheru de bloquu %s montu per nfs" + +#: apt-pkg/contrib/fileutl.cc:176 +#, c-format +msgid "Could not get lock %s" +msgstr "Nun se pudo torgar %s" + +#: apt-pkg/contrib/fileutl.cc:444 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "Esperaba %s pero nun taba ell" + +#: apt-pkg/contrib/fileutl.cc:454 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "El subprocesu %s recibi un fallu de segmentacin." + +#: apt-pkg/contrib/fileutl.cc:457 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "El subprocesu %s devolvi un cdigu d'error (%u)" + +#: apt-pkg/contrib/fileutl.cc:459 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "El subprocesu %s termin de manera inesperada" + +#: apt-pkg/contrib/fileutl.cc:503 +#, c-format +msgid "Could not open file %s" +msgstr "Nun se pudo abrir el ficheru %s" + +#: apt-pkg/contrib/fileutl.cc:559 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "lleos, ent tena de lleer %lu pero nun queda nada" + +#: apt-pkg/contrib/fileutl.cc:589 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "escritos, ent tena d'escribir %lu pero nun pudo facerse" + +#: apt-pkg/contrib/fileutl.cc:664 +msgid "Problem closing the file" +msgstr "Problemes zarrando'l ficheru" + +#: apt-pkg/contrib/fileutl.cc:670 +msgid "Problem unlinking the file" +msgstr "Hai problemes desvenceyando'l ficheru %s" + +#: apt-pkg/contrib/fileutl.cc:681 +msgid "Problem syncing the file" +msgstr "Hai problemes al sincronizar el ficheru" + +#: apt-pkg/pkgcache.cc:132 +msgid "Empty package cache" +msgstr "Cach de paquetes balera." + +#: apt-pkg/pkgcache.cc:138 +msgid "The package cache file is corrupted" +msgstr "El ficheru de cach de paquetes ta tollu" + +#: apt-pkg/pkgcache.cc:143 +msgid "The package cache file is an incompatible version" +msgstr "El ficheru de cach de paquetes ye una versin incompatible" + +#: apt-pkg/pkgcache.cc:148 +#, c-format +msgid "This APT does not support the versioning system '%s'" +msgstr "Esti APT nun soporta'l sistema de versiones '%s'" + +#: apt-pkg/pkgcache.cc:153 +msgid "The package cache was built for a different architecture" +msgstr "La cach de paquetes crese pa una arquitectura estremada" + +#: apt-pkg/pkgcache.cc:224 +msgid "Depends" +msgstr "Depende de" + +#: apt-pkg/pkgcache.cc:224 +msgid "PreDepends" +msgstr "Predepende de" + +#: apt-pkg/pkgcache.cc:224 +msgid "Suggests" +msgstr "Suxer" + +#: apt-pkg/pkgcache.cc:225 +msgid "Recommends" +msgstr "Recomienda" + +#: apt-pkg/pkgcache.cc:225 +msgid "Conflicts" +msgstr "En conflictu con" + +#: apt-pkg/pkgcache.cc:225 +msgid "Replaces" +msgstr "Sustituye a" + +#: apt-pkg/pkgcache.cc:226 +msgid "Obsoletes" +msgstr "Fai obsoletu a" + +#: apt-pkg/pkgcache.cc:226 +msgid "Breaks" +msgstr "Ruempe" + +#: apt-pkg/pkgcache.cc:237 +msgid "important" +msgstr "importante" + +#: apt-pkg/pkgcache.cc:237 +msgid "required" +msgstr "requeru" + +#: apt-pkg/pkgcache.cc:237 +msgid "standard" +msgstr "estndar" + +#: apt-pkg/pkgcache.cc:238 +msgid "optional" +msgstr "opcional" + +#: apt-pkg/pkgcache.cc:238 +msgid "extra" +msgstr "extra" + +#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +msgid "Building dependency tree" +msgstr "Creando rbol de dependencies" + +#: apt-pkg/depcache.cc:122 +msgid "Candidate versions" +msgstr "Versiones candidates" + +#: apt-pkg/depcache.cc:151 +msgid "Dependency generation" +msgstr "Xeneracin de dependencies" + +#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +msgid "Reading state information" +msgstr "Lleendo informacin d'estu" + +#: apt-pkg/depcache.cc:219 +#, c-format +msgid "Failed to open StateFile %s" +msgstr "Nun se pudo abrir el ficheru d'estu %s" + +#: apt-pkg/depcache.cc:225 +#, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Fall la escritura del ficheru temporal d'estu %s" + +#: apt-pkg/tagfile.cc:102 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" + +#: apt-pkg/tagfile.cc:189 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" + +#: apt-pkg/sourcelist.cc:90 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Llinia %lu mal formada na llista d'orxenes %s (URI)" + +#: apt-pkg/sourcelist.cc:92 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist)" + +#: apt-pkg/sourcelist.cc:95 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals d'URI)" + +#: apt-pkg/sourcelist.cc:101 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist absoluta)" + +#: apt-pkg/sourcelist.cc:108 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals de dist)" + +#: apt-pkg/sourcelist.cc:199 +#, c-format +msgid "Opening %s" +msgstr "Abriendo %s" + +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Llinia %u demasiao llarga na llista d'orgenes %s." + +#: apt-pkg/sourcelist.cc:236 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Llinia %u mal formada na llista d'orxenes %s (triba)" + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Triba '%s' desconocida na llinia %u de la llista d'orxenes %s" + +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "Llinia %u mal formada na llista d'orxenes %s (id del proveedor)" + +#: apt-pkg/packagemanager.cc:428 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." +msgstr "" +"Esta execucin d'instalacin va requerir desaniciar temporalmente'l paquete " +"esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye " +"malo, pero si daveres quies facelo, activa la opcin APT::Force-LoopBreak." + +#: apt-pkg/pkgrecords.cc:32 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "La triba de ficheru d'indiz '%s' nun ta sofitada" + +#: apt-pkg/algorithms.cc:248 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." + +#: apt-pkg/algorithms.cc:1107 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Error, pkgProblemResolver::Resolve xener fraaures, esto puede ser pola mor " +"de paquetes retenos." + +#: apt-pkg/algorithms.cc:1109 +msgid "Unable to correct problems, you have held broken packages." +msgstr "Nun pueden iguase los problemes; tienes paquetes fraaos retenidos." + +#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Dellos ficheros d'indiz nun pudieron descargase; ignoraronse o usaronse los " +"antiguos nel so llugar." + +#: apt-pkg/acquire.cc:59 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "Falta'l direutoriu de llistes %spartial." + +#: apt-pkg/acquire.cc:63 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "Falt'l direutoriu d'archivos %spartial." + +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:828 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "Descargando ficheru %li de %li (falten %s)" + +#: apt-pkg/acquire.cc:830 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Descargando ficheru %li de %li" + +#: apt-pkg/acquire-worker.cc:110 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Nun pudo alncontrase'l controlador de mtodu %s." + +#: apt-pkg/acquire-worker.cc:159 +#, c-format +msgid "Method %s did not start correctly" +msgstr "El mtodu %s nun entam correchamente" + +#: apt-pkg/acquire-worker.cc:399 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Por favor, introduz el discu '%s' nel presu '%s' y calca Intro." + +#: apt-pkg/init.cc:124 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "El sistema d'empaquetu '%s' nun ta sofitu" + +#: apt-pkg/init.cc:140 +msgid "Unable to determine a suitable packaging system type" +msgstr "Nun pudo determinase una triba de sistema d'empaquetu afayadiza" + +#: apt-pkg/clean.cc:57 +#, c-format +msgid "Unable to stat %s." +msgstr "Nun pudo lleese %s." + +#: apt-pkg/srcrecords.cc:44 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Has de poner delles URIs 'fonte' nel ficheru sources.list" + +#: apt-pkg/cachefile.cc:71 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Nun pudieron analizase o abrise les llistes de paquetes o el ficheru d'estu." + +#: apt-pkg/cachefile.cc:75 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Has d'executar apt-get update pa iguar estos problemes" + +#: apt-pkg/policy.cc:267 +msgid "Invalid record in the preferences file, no Package header" +msgstr "" +"Rexistru invlidu nel ficheru de preferencies, nun hai cabecera Paquete" + +#: apt-pkg/policy.cc:289 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Nun s'entiende'l tipu de pin %s" + +#: apt-pkg/policy.cc:297 +msgid "No priority (or zero) specified for pin" +msgstr "Nun hai priorid (o ye cero) conseada pa pin" + +#: apt-pkg/pkgcachegen.cc:72 +msgid "Cache has an incompatible versioning system" +msgstr "La cach tien un sistema de versiones incompatible" + +#: apt-pkg/pkgcachegen.cc:115 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Hebo un error al procesar %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:130 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Hebo un error al procesar %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:164 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Hebo un error al procesar %s (NewFileDesc1)" + +#: apt-pkg/pkgcachegen.cc:189 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Hebo un error al procesar %s (UsePackage2)" + +#: apt-pkg/pkgcachegen.cc:193 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Hebo un error al procesar %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:224 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Hebo un error al procesar %s (NewVersion1)" + +#: apt-pkg/pkgcachegen.cc:228 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Hebo un error al procesar %s (UsePackage3)" + +#: apt-pkg/pkgcachegen.cc:232 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Hebo un error al procesar %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:256 +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Hebo un error al procesar %s (NewFileDesc2)" + +#: apt-pkg/pkgcachegen.cc:262 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Coime, perpasaste'l nmberu de nomes de paquete qu'esti APT ye a remanar." + +#: apt-pkg/pkgcachegen.cc:265 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Vaya, perpasaste'l nmberu de versiones coles que puede esti APT." + +#: apt-pkg/pkgcachegen.cc:268 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Coime, perpasaste'l nmberu de descripciones qu'esti APT ye a remanar." + +#: apt-pkg/pkgcachegen.cc:271 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "Vaya, perpasaste'l nmberu de dependencies coles que puede esti APT." + +#: apt-pkg/pkgcachegen.cc:299 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Hebo un error al procesar %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:312 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "Hebo un error al procesar %s (CollectFileProvides)" + +#: apt-pkg/pkgcachegen.cc:318 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Al procesar dependencies de ficheros nun s'alcontr el paquete %s %s" + +#: apt-pkg/pkgcachegen.cc:690 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s" + +#: apt-pkg/pkgcachegen.cc:775 +msgid "Collecting File Provides" +msgstr "Recoyendo ficheros qu'apurren" + +#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 +msgid "IO Error saving source cache" +msgstr "Fallu de E/S al grabar cach d'orxenes" + +#: apt-pkg/acquire-item.cc:127 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "fall'l cambiu de nome, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:401 +msgid "MD5Sum mismatch" +msgstr "La suma MD5 nun concasa" + +#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +msgid "Hash Sum mismatch" +msgstr "La suma hash nun concasa" + +#: apt-pkg/acquire-item.cc:1118 +msgid "There is no public key available for the following key IDs:\n" +msgstr "Nun hai clave pblica denguna disponible pa les IDs de clave darru:\n" + +#: apt-pkg/acquire-item.cc:1231 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " +"necesites iguar manualmente esti paquete (por faltar una arquitectura)" + +#: apt-pkg/acquire-item.cc:1290 +#, c-format +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" +"Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " +"necesites iguar manualmente esti paquete" + +#: apt-pkg/acquire-item.cc:1331 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Los ficheros d'indiz de paquetes tan corrompos. Nun hai campu Filename: pal " +"paquete %s." + +#: apt-pkg/acquire-item.cc:1418 +msgid "Size mismatch" +msgstr "El tamau nun concasa" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "El bloque de proveedor %s nun contin una buelga dixital" + +#: apt-pkg/cdrom.cc:529 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"Usando el puntu de montaxe de CD-ROM %s\n" +"Montando el CD-ROM\n" + +#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +msgid "Identifying.. " +msgstr "Identificando.. " + +#: apt-pkg/cdrom.cc:563 +#, c-format +msgid "Stored label: %s\n" +msgstr "Etiqueta guardada: %s\n" + +#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +msgid "Unmounting CD-ROM...\n" +msgstr "Desmontando l CD-ROM...\n" + +#: apt-pkg/cdrom.cc:590 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "Usando el puntu de montaxe de CD-ROM %s\n" + +#: apt-pkg/cdrom.cc:608 +msgid "Unmounting CD-ROM\n" +msgstr "Desmontando'l CD-ROM\n" + +#: apt-pkg/cdrom.cc:612 +msgid "Waiting for disc...\n" +msgstr "Esperando'l discu...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:620 +msgid "Mounting CD-ROM...\n" +msgstr "Montando'l CD-ROM...\n" + +#: apt-pkg/cdrom.cc:638 +msgid "Scanning disc for index files..\n" +msgstr "Buscando nel discu ficheros d'ndices...\n" + +#: apt-pkg/cdrom.cc:678 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" +msgstr "" +"Atopu %zu indices de paquete, %zu indices de fonte, %zu indices de torna y %" +"zu firmes\n" + +#: apt-pkg/cdrom.cc:715 +#, c-format +msgid "Found label '%s'\n" +msgstr "Atopse la etiqueta: '%s'\n" + +#: apt-pkg/cdrom.cc:744 +msgid "That is not a valid name, try again.\n" +msgstr "Esi nun ye un nome vlidu; intntalo otra vuelta.\n" + +#: apt-pkg/cdrom.cc:760 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Esti discu llmase: \n" +"'%s'\n" + +#: apt-pkg/cdrom.cc:764 +msgid "Copying package lists..." +msgstr "Copiando les llistes de paquetes..." + +#: apt-pkg/cdrom.cc:790 +msgid "Writing new source list\n" +msgstr "Escribiendo llista nueva d'orxenes\n" + +#: apt-pkg/cdrom.cc:799 +msgid "Source list entries for this disc are:\n" +msgstr "Les entraes de la llista d'orxenes pa esti discu son:\n" + +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#, c-format +msgid "Wrote %i records.\n" +msgstr "%i rexistros escritos.\n" + +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "%i rexistros escritos con %i ficheros de menos.\n" + +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "%i rexistros escritos con %i ficheros mal empareyaos\n" + +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" +"Escribironse %i rexistros con %i ficheros perdos y %i ficheros que nun " +"concasen\n" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, c-format +msgid "Installing %s" +msgstr "Instalando %s" + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:612 +#, c-format +msgid "Configuring %s" +msgstr "Configurando %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:627 +#, c-format +msgid "Removing %s" +msgstr "Desinstalando %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "Executando activador de post-instalacin de %s" + +#: apt-pkg/deb/dpkgpm.cc:521 +#, c-format +msgid "Directory '%s' missing" +msgstr "Falta'l direutoriu '%s'." + +#: apt-pkg/deb/dpkgpm.cc:605 +#, c-format +msgid "Preparing %s" +msgstr "Preparando %s" + +#: apt-pkg/deb/dpkgpm.cc:606 +#, c-format +msgid "Unpacking %s" +msgstr "Desempaquetando %s" + +#: apt-pkg/deb/dpkgpm.cc:611 +#, c-format +msgid "Preparing to configure %s" +msgstr "Preparndose pa configurar %s" + +#: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 +#, c-format +msgid "Processing triggers for %s" +msgstr "Procesando disparadores pa %s" + +#: apt-pkg/deb/dpkgpm.cc:617 +#, c-format +msgid "Installed %s" +msgstr "%s instalu" + +#: apt-pkg/deb/dpkgpm.cc:622 apt-pkg/deb/dpkgpm.cc:624 +#: apt-pkg/deb/dpkgpm.cc:625 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Preparndose pa desinstalar %s" + +#: apt-pkg/deb/dpkgpm.cc:628 +#, c-format +msgid "Removed %s" +msgstr "%s desinstalu" + +#: apt-pkg/deb/dpkgpm.cc:633 +#, c-format +msgid "Preparing to completely remove %s" +msgstr "Preparndose pa desinstalar dafechu %s" + +#: apt-pkg/deb/dpkgpm.cc:634 +#, c-format +msgid "Completely removed %s" +msgstr "Desinstalse dafechu %s" + +#: apt-pkg/deb/dpkgpm.cc:791 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +msgstr "" +"Nun puede escribise nel rexistru, fall openpty() (/dev/pts nun ta " +"montu?)\n" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "Nun fui quien a parchiar el ficheru" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Conexn encaboxada prematuramente" -- cgit v1.2.3-70-g09d2 From a25b11935ea957309265a2cbaa4955a5feeca0b9 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 21 May 2009 12:19:01 +0200 Subject: Updated Asturian translation --- debian/changelog | 3 ++- po/ChangeLog | 4 ++++ po/ast.po | 10 ++++------ 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6b98a1d67..1982d5c3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,8 @@ apt (0.7.22) UNRELEASED; urgency=low - ru.po. Closes: #526816 - eu.po. Closes: #528985 * Added translations - - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007 + - ast.po (Asturian by Marcos Alvareez Costales). + Closes: #529007, #529730 -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/po/ChangeLog b/po/ChangeLog index 589be588f..d53fc0400 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-05-21 Marcos + + * ast.po: Updated to 539t + 2009-04-28 Ivan Masár * sk.po: Updated to 539t diff --git a/po/ast.po b/po/ast.po index bf5ab0dc3..01ee81acd 100644 --- a/po/ast.po +++ b/po/ast.po @@ -3,9 +3,8 @@ msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-05-17 10:52+0100\n" -"Last-Translator: Marcos Alvarez Costales \n" +"PO-Revision-Date: 2009-05-21 09:37+0100\n" +"Last-Translator: Marcos \n" "Language-Team: Asturian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -520,10 +519,9 @@ msgid "Failed to unlink %s" msgstr "Nun pudo desenllazase %s" #: ftparchive/writer.cc:273 -#, fuzzy, c-format -#| msgid "Failed to rename %s to %s" +#, c-format msgid "*** Failed to link %s to %s" -msgstr "Nun pudo renomase %s como %s" +msgstr "*** Fall enllazar enllazr %s a %s" #: ftparchive/writer.cc:283 #, c-format -- cgit v1.2.3-70-g09d2 From 56e571b210beed5d9c91be6a6a191cf315cc0d59 Mon Sep 17 00:00:00 2001 From: Deng Xiyue Date: Mon, 1 Jun 2009 10:55:26 +0200 Subject: Simplified Chinese translation update --- debian/changelog | 3 +- po/ChangeLog | 4 ++ po/zh_CN.po | 214 +++++++++++++++++++++++-------------------------------- 3 files changed, 97 insertions(+), 124 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1982d5c3c..19dc02e04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ apt (0.7.22) UNRELEASED; urgency=low * Documentation translations: - - Fix a typo in apt-get(8 French translation. Closes: #525043 + - Fix a typo in apt-get(8) French translation. Closes: #525043 Thanks to Guillaume Delacour for spotting it. * Translations: - fr.po - sk.po. Closes: #525857 - ru.po. Closes: #526816 - eu.po. Closes: #528985 + - zh_CN.po. Closes: #531390 * Added translations - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007, #529730 diff --git a/po/ChangeLog b/po/ChangeLog index d53fc0400..e61d88b05 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-06-01 Deng Xiyue + + * zh_CN.po: Updated to 539t + 2009-05-21 Marcos * ast.po: Updated to 539t diff --git a/po/zh_CN.po b/po/zh_CN.po index 68183040d..abb4585ce 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2008-11-15 00:49+0800\n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"PO-Revision-Date: 2009-06-01 15:54+0800\n" "Last-Translator: Deng Xiyue \n" "Language-Team: Debian Chinese [GB] \n" "MIME-Version: 1.0\n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s 编译于 %s %s\n" @@ -651,7 +651,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -812,11 +812,11 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "无法对下载目录加锁" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "无法读取安装源列表。" @@ -845,7 +845,7 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的空余空间" @@ -882,7 +882,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -891,7 +891,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件下载失败" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -988,34 +988,29 @@ msgstr "未找到“%2$s”的“%1$s”版本" msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#: cmdline/apt-get.cc:1307 -#, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "" - -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr " update 命令是不需任何参数的" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "下列软件包是自动安装的并且现在不再被使用了：" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用'apt-get autoremove'来删除它们" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1031,43 +1026,43 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "下列的信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动删除器坏事了" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级坏事了" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" msgstr "无法找到任务 %s" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1075,7 +1070,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1720 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1086,122 +1081,122 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们还在新到(incoming)目录中。" -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "无法安装的软件包" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "正在筹划升级... " -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决器坏事了" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的空余空间" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1210,31 +1205,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "被支持模块：" -#: cmdline/apt-get.cc:2628 -#, fuzzy +#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1250,7 +1244,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1843,7 +1837,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入散列表时出错" @@ -1927,38 +1921,38 @@ msgstr "解析“%s:%s”时，出现了某些故障 (%i)" msgid "Unable to connect to %s %s:" msgstr "不能连接上 %s %s：" -#: methods/gpgv.cc:71 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "无法访问密匙：“%s”" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1974,80 +1968,80 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:379 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:525 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" -#: methods/http.cc:533 +#: methods/http.cc:531 msgid "Bad header line" msgstr "错误的报头条目" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "该 http 服务器发送了一个无效的应答报头" -#: methods/http.cc:588 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:603 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:605 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "该 http 服务器的 range 支持不正常" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:782 +#: methods/http.cc:774 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:787 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "连接服务器超时" -#: methods/http.cc:810 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:841 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "写文件时出错" -#: methods/http.cc:869 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "写文件时出错" -#: methods/http.cc:883 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:885 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "截断文件失败" -#: methods/http.cc:1141 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1305 +#: methods/http.cc:1229 msgid "Internal error" msgstr "内部错误" @@ -2066,32 +2060,10 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 " +"apt.conf)" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "没有发现您的所选 %s" @@ -2518,7 +2490,7 @@ msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。" msgid "Method %s did not start correctly" msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" @@ -2878,14 +2850,10 @@ msgstr "正在准备完全删除 %s" msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:789 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n" -#: apt-pkg/deb/debsystem.cc:100 -msgid "Not locked" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "无法打开补丁文件" -- cgit v1.2.3-70-g09d2 From 8f700229c7fd085ed572560cacfba332342b7d2e Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 2 Jun 2009 07:37:38 +0200 Subject: Update French translation --- debian/changelog | 1 + po/fr.po | 270 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 149 insertions(+), 122 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 19dc02e04..170170f21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.22) UNRELEASED; urgency=low - ru.po. Closes: #526816 - eu.po. Closes: #528985 - zh_CN.po. Closes: #531390 + - fr.po * Added translations - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007, #529730 diff --git a/po/fr.po b/po/fr.po index 780199e64..c1a1b076a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2009-04-23 08:03+0200\n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"PO-Revision-Date: 2009-06-02 07:36+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" @@ -665,7 +665,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -828,11 +828,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." @@ -864,7 +864,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" @@ -905,7 +905,7 @@ msgstr "Annulation." msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" @@ -914,7 +914,7 @@ msgstr "Impossible de récupérer %s %s\n" msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" @@ -1014,26 +1014,21 @@ msgstr "La version « %s » de « %s » n'a pu être trouvée" msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1307 -#, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n" - -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est sensée se produire : impossible de lancer " "« Autoremover »" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1041,11 +1036,11 @@ msgstr "" "Les paquets suivants ont été installés automatiquement et ne sont plus " "nécessaires :" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1064,44 +1059,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" msgstr "Impossible de trouver la tâche %s" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1109,7 +1104,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1720 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1121,119 +1116,119 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1242,7 +1237,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1251,32 +1246,73 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2628 +#: cmdline/apt-get.cc:2619 +#| msgid "" +#| "Usage: apt-get [options] command\n" +#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" +#| " apt-get [options] source pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-get is a simple command line interface for downloading and\n" +#| "installing packages. The most frequently used commands are update\n" +#| "and install.\n" +#| "\n" +#| "Commands:\n" +#| " update - Retrieve new lists of packages\n" +#| " upgrade - Perform an upgrade\n" +#| " install - Install new packages (pkg is libc6 not libc6.deb)\n" +#| " remove - Remove packages\n" +#| " autoremove - Remove automatically all unused packages\n" +#| " purge - Remove packages and config files\n" +#| " source - Download source archives\n" +#| " build-dep - Configure build-dependencies for source packages\n" +#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n" +#| " dselect-upgrade - Follow dselect selections\n" +#| " clean - Erase downloaded archive files\n" +#| " autoclean - Erase old downloaded archive files\n" +#| " check - Verify that there are no broken dependencies\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -q Loggable output - no progress indicator\n" +#| " -qq No output except for errors\n" +#| " -d Download only - do NOT install or unpack archives\n" +#| " -s No-act. Perform ordering simulation\n" +#| " -y Assume Yes to all queries and do not prompt\n" +#| " -f Attempt to correct a system with broken dependencies in place\n" +#| " -m Attempt to continue if archives are unlocatable\n" +#| " -u Show a list of upgraded packages as well\n" +#| " -b Build the source package after fetching it\n" +#| " -V Show verbose version numbers\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +#| "pages for more information and options.\n" +#| " This APT has Super Cow Powers.\n" msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1292,7 +1328,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1904,7 +1940,7 @@ msgstr "Délai de connexion au port de données dépassé" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -1990,43 +2026,43 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Impossible de se connecter à %s %s :" -#: methods/gpgv.cc:71 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Impossible d'accéder au porte-clés : « %s »" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erreur interne : signature correcte, mais il est impossible de déterminer " "l'empreinte de la clé." -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "Au moins une signature non valable a été rencontrée." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Impossible d'exécuter « %s » pour contrôler la signature\n" "(veuillez vérifier si gpgv est installé)." -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Erreur inconnue à l'exécution de gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Les signatures suivantes ne sont pas valables :\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2044,80 +2080,80 @@ msgstr "Ne parvient pas à ouvrir le tube pour %s" msgid "Read error from %s process" msgstr "Erreur de lecture du processus %s" -#: methods/http.cc:379 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "Attente des fichiers d'en-tête" -#: methods/http.cc:525 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "J'ai une simple ligne d'en-tête au-dessus du caractère %u" -#: methods/http.cc:533 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Mauvaise ligne d'en-tête" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Le serveur http a envoyé une réponse dont l'en-tête est invalide" -#: methods/http.cc:588 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Le serveur http a envoyé un en-tête « Content-Length » invalide" -#: methods/http.cc:603 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Le serveur http a envoyé un en-tête « Content-Range » invalide" -#: methods/http.cc:605 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Ce serveur http possède un support des limites non-valide" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:782 +#: methods/http.cc:774 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:787 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:810 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:841 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:869 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:883 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:885 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Échec de la troncature du fichier" -#: methods/http.cc:1141 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1305 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Erreur interne" @@ -2140,31 +2176,7 @@ msgstr "" "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur " "actuelle est de %lu (voir « man 5 apt.conf »)." -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "%lid %lih %limin %lis" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 -#, c-format -msgid "%lih %limin %lis" -msgstr "%lih %limin %lis" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 -#, c-format -msgid "%limin %lis" -msgstr "%limin %lis" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 -#, c-format -msgid "%lis" -msgstr "%lis" - -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "La sélection %s n'a pu être trouvée" @@ -2600,7 +2612,7 @@ msgstr "Le pilote pour la méthode %s n'a pu être trouvé." msgid "Method %s did not start correctly" msgstr "La méthode %s n'a pas démarré correctement" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2983,16 +2995,12 @@ msgstr "Préparation de la suppression complète de %s" msgid "Completely removed %s" msgstr "%s complètement supprimé" -#: apt-pkg/deb/dpkgpm.cc:789 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossible d'écrire le journal, échec d'openpty()\n" "(/dev/pts est-il monté ?)\n" -#: apt-pkg/deb/debsystem.cc:100 -msgid "Not locked" -msgstr "Non verrouillé" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Impossible de corriger le fichier" @@ -3001,5 +3009,23 @@ msgstr "Impossible de corriger le fichier" msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n" + +#~ msgid "%lid %lih %limin %lis" +#~ msgstr "%lid %lih %limin %lis" + +#~ msgid "%lih %limin %lis" +#~ msgstr "%lih %limin %lis" + +#~ msgid "%limin %lis" +#~ msgstr "%limin %lis" + +#~ msgid "%lis" +#~ msgstr "%lis" + +#~ msgid "Not locked" +#~ msgstr "Non verrouillé" + #~ msgid "Dynamic MMap ran out of room" #~ msgstr "La zone dynamique d'allocation mémoire n'a plus de place" -- cgit v1.2.3-70-g09d2 From 331b0e8e913ebb78a16cc88e3962396ff33315cc Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 5 Jun 2009 20:37:49 +0200 Subject: Pending translations --- debian/changelog | 2 + po/ChangeLog | 8 ++ po/ca.po | 300 ++++++++++++++++++++++++++++++------------------------- po/it.po | 261 ++++++++++++++++++++++------------------------- 4 files changed, 295 insertions(+), 276 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 170170f21..5d3a801a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.22) UNRELEASED; urgency=low - eu.po. Closes: #528985 - zh_CN.po. Closes: #531390 - fr.po + - it.po. Closes: #531758 + - ca.po. Closes: #531921 * Added translations - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007, #529730 diff --git a/po/ChangeLog b/po/ChangeLog index e61d88b05..913409731 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,11 @@ +2009-06-05 Jordi Mallach + + * ca.po: Updated to 538t1f + +2009-06-04 Milo Casagrande + + * it.po: Updated to 539t + 2009-06-01 Deng Xiyue * zh_CN.po: Updated to 539t diff --git a/po/ca.po b/po/ca.po index 5e061aa66..d680f9560 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,14 +1,14 @@ # Catalan translation of APT. -# Copyright © 2002, 2003, 2004, 2005, 2006, 2008 Software in the Public Interest, Inc. +# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009 Software in the Public Interest, Inc. # Antoni Bella Perez , 2002, 2003. # Matt Bonner , 2003. -# Jordi Mallach , 2004, 2005, 2006, 2008. +# Jordi Mallach , 2004, 2005, 2006, 2008, 2009. # msgid "" msgstr "" -"Project-Id-Version: apt 0.7.20\n" +"Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" "PO-Revision-Date: 2008-12-21 20:24+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -90,7 +90,7 @@ msgstr "Total de l'espai desperdiciat: " #: cmdline/apt-cache.cc:343 msgid "Total space accounted for: " -msgstr "Total de l'espai atribuit a: " +msgstr "Total de l'espai atribuït a: " #: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 #, c-format @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" @@ -655,7 +655,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -819,11 +819,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@ -854,7 +854,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -891,7 +891,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -900,7 +900,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@ -998,37 +998,32 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»" msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1307 -#, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "" - -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Els paquets següents s'instal·laren automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,43 +1041,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" msgstr "No s'ha pogut trobar la tasca %s" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instal·lat manualment.\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1090,7 +1085,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1720 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1102,120 +1097,120 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Obté el font %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1219,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,33 +1228,74 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2628 +#: cmdline/apt-get.cc:2619 #, fuzzy +#| msgid "" +#| "Usage: apt-get [options] command\n" +#| " apt-get [options] install|remove pkg1 [pkg2 ...]\n" +#| " apt-get [options] source pkg1 [pkg2 ...]\n" +#| "\n" +#| "apt-get is a simple command line interface for downloading and\n" +#| "installing packages. The most frequently used commands are update\n" +#| "and install.\n" +#| "\n" +#| "Commands:\n" +#| " update - Retrieve new lists of packages\n" +#| " upgrade - Perform an upgrade\n" +#| " install - Install new packages (pkg is libc6 not libc6.deb)\n" +#| " remove - Remove packages\n" +#| " autoremove - Remove automatically all unused packages\n" +#| " purge - Remove packages and config files\n" +#| " source - Download source archives\n" +#| " build-dep - Configure build-dependencies for source packages\n" +#| " dist-upgrade - Distribution upgrade, see apt-get(8)\n" +#| " dselect-upgrade - Follow dselect selections\n" +#| " clean - Erase downloaded archive files\n" +#| " autoclean - Erase old downloaded archive files\n" +#| " check - Verify that there are no broken dependencies\n" +#| "\n" +#| "Options:\n" +#| " -h This help text.\n" +#| " -q Loggable output - no progress indicator\n" +#| " -qq No output except for errors\n" +#| " -d Download only - do NOT install or unpack archives\n" +#| " -s No-act. Perform ordering simulation\n" +#| " -y Assume Yes to all queries and do not prompt\n" +#| " -f Attempt to correct a system with broken dependencies in place\n" +#| " -m Attempt to continue if archives are unlocatable\n" +#| " -u Show a list of upgraded packages as well\n" +#| " -b Build the source package after fetching it\n" +#| " -V Show verbose version numbers\n" +#| " -c=? Read this configuration file\n" +#| " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +#| "pages for more information and options.\n" +#| " This APT has Super Cow Powers.\n" msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1275,7 +1311,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1316,7 +1352,7 @@ msgstr "" " install - Instal·la nous paquets (el paquet és libc6 no libc6.deb)\n" " remove - Suprimeix paquets\n" " autoremove - Suprimeix automàticament tots els paquets en desús\n" -" purge - Suprimeix i purga paquets\n" +" purge - Suprimeix paquets i els seus fitxers de configuració\n" " source - Baixa arxius font\n" " build-dep - Configura dependències de construcció pels paquets font\n" " dist-upgrade - Actualitza la distribució, vegeu apt-get(8)\n" @@ -1350,7 +1386,7 @@ msgstr "Obj " #: cmdline/acqprogress.cc:79 msgid "Get:" -msgstr "Des:" +msgstr "Bai:" #: cmdline/acqprogress.cc:110 msgid "Ign " @@ -1420,7 +1456,7 @@ msgstr "Premeu Intro per a continuar." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" -msgstr "Voleu suprimir els paquets .deb baixats previament?" +msgstr "Voleu suprimir els paquets .deb baixats prèviament?" #: dselect/install:101 msgid "Some errors occurred while unpacking. I'm going to configure the" @@ -1475,7 +1511,7 @@ msgstr "Signatura de l'arxiu no vàlida" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "S'ha produït un rrror en llegir la capçalera del membre de l'arxiu" +msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu" #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" @@ -1620,7 +1656,7 @@ msgstr "S'està llegint la llista de paquets" #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo" +msgstr "No s'ha pogut canviar al directori d'administració %sinfo" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 @@ -1823,7 +1859,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protocol corrumput" +msgstr "Protocol corromput" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 msgid "Write error" @@ -1880,7 +1916,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1964,44 +2000,44 @@ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)" msgid "Unable to connect to %s %s:" msgstr "No es pot connectar amb %s %s:" -#: methods/gpgv.cc:71 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " "sortint." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el " "gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2019,81 +2055,81 @@ msgstr "No s'ha pogut obrir un conducte per a %s" msgid "Read error from %s process" msgstr "S'ha produït un error en llegir des del procés %s" -#: methods/http.cc:379 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "S'estan esperant les capçaleres" -#: methods/http.cc:525 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters" -#: methods/http.cc:533 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Línia de capçalera incorrecta" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "El servidor HTTP ha enviat una capçalera de resposta no vàlida" -#: methods/http.cc:588 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El servidor HTTP ha enviat una capçalera de Content-Length no vàlida" -#: methods/http.cc:603 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El servidor HTTP ha enviat una capçalera de Content-Range no vàlida" -#: methods/http.cc:605 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Aquest servidor HTTP té el suport d'abast trencat" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:782 +#: methods/http.cc:774 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:787 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:810 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:841 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:869 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:883 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:885 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "No s'ha pogut truncar el fitxer %s" -#: methods/http.cc:1141 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1305 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Error intern" @@ -2115,31 +2151,7 @@ msgstr "" "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. " "Valor actual: %lu. (man 5 apt.conf)" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" @@ -2182,7 +2194,7 @@ msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" #: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Included from here" -msgstr "Error sintàctic %s:%u: Inclusió des d'aqui" +msgstr "Error sintàctic %s:%u: Inclusió des d'aquí" #: apt-pkg/contrib/configuration.cc:758 #, c-format @@ -2274,7 +2286,7 @@ msgstr "" #: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "No es pot resoldre el fixter de blocat %s" +msgstr "No es pot resoldre el fitxer de blocat %s" #: apt-pkg/contrib/fileutl.cc:172 #, c-format @@ -2356,11 +2368,11 @@ msgstr "La memòria cau de paquets fou creada per a una arquitectura diferent" #: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "Depén" +msgstr "Depèn" #: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "Predepén" +msgstr "Predepèn" #: apt-pkg/pkgcache.cc:224 msgid "Suggests" @@ -2570,7 +2582,7 @@ msgstr "No s'ha pogut trobar el mètode de control %s." msgid "Method %s did not start correctly" msgstr "El mètode %s no s'ha iniciat correctament" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro." @@ -2893,7 +2905,7 @@ msgstr "S'està suprimint el paquet %s" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Running post-installation trigger %s" -msgstr "S'està executant el gallet de postinstal·lació %s" +msgstr "S'està executant l'activador de postinstal·lació %s" #: apt-pkg/deb/dpkgpm.cc:521 #, c-format @@ -2918,7 +2930,7 @@ msgstr "S'està preparant per a configurar el paquet %s" #: apt-pkg/deb/dpkgpm.cc:614 apt-pkg/deb/dpkgpm.cc:615 #, c-format msgid "Processing triggers for %s" -msgstr "S'estan processant els gallets per al paquet %s" +msgstr "S'estan processant els activadors per al paquet %s" #: apt-pkg/deb/dpkgpm.cc:617 #, c-format @@ -2946,16 +2958,12 @@ msgstr "S'està preparant per a suprimir completament el paquet %s" msgid "Completely removed %s" msgstr "S'ha suprimit completament el paquet %s" -#: apt-pkg/deb/dpkgpm.cc:789 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/" "pts?)\n" -#: apt-pkg/deb/debsystem.cc:100 -msgid "Not locked" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "No s'ha pogut aplicar el pedaç al fitxer" @@ -2964,6 +2972,24 @@ msgstr "No s'ha pogut aplicar el pedaç al fitxer" msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n" + +#~ msgid "%lid %lih %limin %lis" +#~ msgstr "%lid %lih %limin %lis" + +#~ msgid "%lih %limin %lis" +#~ msgstr "%lih %limin %lis" + +#~ msgid "%limin %lis" +#~ msgstr "limin %lis" + +#~ msgid "%lis" +#~ msgstr "%lis" + +#~ msgid "Not locked" +#~ msgstr "No blocat" + #~ msgid "Dynamic MMap ran out of room" #~ msgstr "L'MMap dinàmic s'ha quedat sense espai" diff --git a/po/it.po b/po/it.po index 633f67a07..3a494360e 100644 --- a/po/it.po +++ b/po/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.20\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2009-04-01 19:54+0200\n" +"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"PO-Revision-Date: 2009-06-04 13:23+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -158,7 +158,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per %s compilato il %s %s\n" @@ -660,7 +660,7 @@ msgstr "Rinomina di %s in %s non riuscita" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 #, c-format msgid "Regex compilation error - %s" msgstr "Errore di compilazione dell'espressione regolare - %s" @@ -826,11 +826,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Errore interno, l'ordinamento non è stato terminato" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 msgid "Unable to lock the download directory" msgstr "Impossibile bloccare la directory di scaricamento" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Impossibile leggere l'elenco dei sorgenti." @@ -860,7 +860,7 @@ msgstr "Dopo quest'operazione, verranno occupati %sB di spazio su disco.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Dopo quest'operazione, verranno liberati %sB di spazio su disco.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossibile determinare lo spazio libero su %s" @@ -899,7 +899,7 @@ msgstr "Interrotto." msgid "Do you want to continue [Y/n]? " msgstr "Continuare [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossibile recuperare %s %s\n" @@ -908,7 +908,7 @@ msgstr "Impossibile recuperare %s %s\n" msgid "Some files failed to download" msgstr "Scaricamento di alcuni file non riuscito" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 msgid "Download complete and in download only mode" msgstr "Scaricamento completato e in modalità solo scaricamento" @@ -1008,25 +1008,20 @@ msgstr "Version \"%s\" per \"%s\" non trovato" msgid "Selected version %s (%s) for %s\n" msgstr "Versione %s (%s) selezionata per %s\n" -#: cmdline/apt-get.cc:1307 -#, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "" - -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1338 msgid "The update command takes no arguments" msgstr "Il comando update non accetta argomenti" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1351 msgid "Unable to lock the list directory" msgstr "Impossibile bloccare la directory" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1403 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non si è autorizzati a rimuovere nulla, impossibile avviare AutoRemover" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1435 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1034,11 +1029,11 @@ msgstr "" "I seguenti pacchetti sono stati installati automaticamente e non sono più " "richiesti:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1437 msgid "Use 'apt-get autoremove' to remove them." msgstr "Usare \"apt-get autoremove\" per rimuoverli." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1442 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1056,44 +1051,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 msgid "The following information may help to resolve the situation:" msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: " -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1449 msgid "Internal Error, AutoRemover broke stuff" msgstr "Errore interno, AutoRemover ha rovinato qualche cosa" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1468 msgid "Internal error, AllUpgrade broke stuff" msgstr "Errore interno, AllUpgrade ha rovinato qualche cosa" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1523 #, c-format msgid "Couldn't find task %s" msgstr "Impossibile trovare il task %s" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 #, c-format msgid "Couldn't find package %s" msgstr "Impossibile trovare il pacchetto %s" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1661 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, si sta selezionando %s per l'espressione regolare \"%s\"\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1692 #, c-format msgid "%s set to manually installed.\n" msgstr "È stato impostato %s per l'installazione manuale.\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1705 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "È utile eseguire \"apt-get -f install\" per correggere questi problemi:" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1708 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1101,7 +1096,7 @@ msgstr "" "Dipendenze non soddisfatte. Provare \"apt-get -f install\" senza pacchetti " "(o specificare una soluzione)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1720 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1113,162 +1108,161 @@ msgstr "" "usando una distribuzione in sviluppo, che alcuni pacchetti richiesti\n" "non sono ancora stati creati o sono stati rimossi da Incoming." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1738 msgid "Broken packages" msgstr "Pacchetto danneggiato" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1767 msgid "The following extra packages will be installed:" msgstr "I seguenti pacchetti saranno inoltre installati:" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1856 msgid "Suggested packages:" msgstr "Pacchetti suggeriti:" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1857 msgid "Recommended packages:" msgstr "Pacchetti raccomandati:" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1885 msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Non riuscito" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1893 msgid "Done" msgstr "Eseguito" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 msgid "Internal error, problem resolver broke stuff" msgstr "Errore interno, \"problem resolver\" ha rovinato qualcosa" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2068 msgid "Must specify at least one package to fetch source for" msgstr "" "È necessario specificare almeno un pacchetto di cui recuperare il sorgente" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossibile trovare un pacchetto sorgente per %s" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2147 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Il pacchetto \"%s\" già scaricato viene saltato\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2175 #, c-format msgid "You don't have enough free space in %s" msgstr "Lo spazio libero in %s è insufficiente" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "È necessario recuperare %sB/%sB di sorgenti.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "È necessario recuperare %sB di sorgenti\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Fetch source %s\n" msgstr "Recupero sorgente %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2221 msgid "Failed to fetch some archives." msgstr "Recupero di alcuni archivi non riuscito." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2249 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Estrazione del pacchetto sorgente già estratto in %s saltata\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2261 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando di estrazione \"%s\" non riuscito.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificare che il pacchetto \"dpkg-dev\" sia installato.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2279 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando \"%s\" di generazione non riuscito.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2298 msgid "Child process failed" msgstr "Creazione processo figlio non riuscita" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2314 msgid "Must specify at least one package to check builddeps for" msgstr "" "È necessario specificare almeno un pacchetto di cui controllare le " "dipendenze di generazione" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2342 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossibile ottenere informazioni di dipendenza di generazione per %s" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2362 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ha dipendenze di generazione.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2414 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perchè il pacchetto %s " +"%s dipendenze per %s non possono essere soddisfatte perché il pacchetto %s " "non può essere trovato" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2467 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%s dipendenze per %s non possono essere soddisfatte perchè nessuna versione " +"%s dipendenze per %s non possono essere soddisfatte perché nessuna versione " "del pacchetto %s può soddisfare le richieste di versione" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2503 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "La dipendenza %s per %s non è stata soddisfatta: il pacchetto installato %s " "è troppo nuovo" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2528 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "La dipendenza %s per %s non è stata soddisfatta: %s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2542 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Le dipendenze di generazione per %s non sono state soddisfatte." -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2546 msgid "Failed to process build dependencies" msgstr "Elaborazione delle dipendenze di generazione non riuscita" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2578 msgid "Supported modules:" msgstr "Moduli supportati:" -#: cmdline/apt-get.cc:2628 -#, fuzzy +#: cmdline/apt-get.cc:2619 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1284,7 +1278,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1316,11 +1310,10 @@ msgstr "" " apt-get [OPZIONI] source PKG1 [PKG2 ...]\n" "\n" "apt-get è una semplice interfaccia a riga di comando per scaricare \n" -"e installare pacchetti. I comandi più usati sono update \n" -"e install.\n" +"e installare pacchetti. I comandi più usati sono update e install.\n" "\n" "Comandi:\n" -" update - Scarica l'elenco dei pacchetti aggiornato\n" +" update - Scarica l'elenco aggiornato dei pacchetti\n" " upgrade - Esegue un aggiornamento dei pacchetti installati\n" " install - Installa nuovi pacchetti (PKG è libc6 non libc6.deb)\n" " remove - Rimuove i pacchetti\n" @@ -1329,10 +1322,10 @@ msgstr "" " source - Scarica i pacchetti sorgente\n" " build-dep - Configura le dipendenze di compilazione per i pacchetti " "sorgente\n" -" dist-upgrade - Esegue un avanzamento della distribuzione, vedere apt-get" -"(8)\n" +" dist-upgrade - Esegue un avanzamento della distribuzione, consultare apt-" +"get(8)\n" " dselect-upgrade - Segue le selezioni di dselect\n" -" clean - Elimina i file dei pacchetti scaricati \n" +" clean - Elimina i file dei pacchetti scaricati\n" " autoclean - Elimina i vecchi pacchetti scaricati\n" " check - Verifica che non ci siano dipendenze insoddisfatte\n" "\n" @@ -1345,12 +1338,12 @@ msgstr "" " -y Assume una risposta affermativa a tutte le domande e non chiede " "conferma\n" " -f Tenta di continuare se il controllo di integrità non riesce\n" -" -m Tenta di continuare se gli archivi non si trovano\n" -" -u Mostra un elenco dei pacchetti da aggiornare\n" +" -m Tenta di continuare se gli archivi non sono localizzabili\n" +" -u Mostra un elenco dei pacchetti aggiornati\n" " -b Genera il pacchetto sorgente dopo averlo recuperato\n" " -V Mostra prolissamente i numeri di versione\n" " -c=? Legge come configurazione il file specificato\n" -" -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n" +" -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n" "Per maggiori informazioni e opzioni, consultare le pagine di manuale\n" "apt-get(8), sources.list(5) e apt.conf(5).\n" " Questo APT ha i poteri della Super Mucca.\n" @@ -1565,7 +1558,7 @@ msgstr "La directory %s è deviata" #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "" -"Il pacchetto sta cercando di scrivere nell'obiettivo di destinazione %s/%s" +"Il pacchetto sta cercando di scrivere nell'obiettivo di deviazione %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" @@ -1683,7 +1676,7 @@ msgstr "Riga non valida nel file di diversion: %s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "Errore interno nell'aggiungere un diversion" +msgstr "Errore interno nell'aggiungere una deviazioni" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -1896,7 +1889,7 @@ msgstr "Connessione al socket dati terminata" msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" @@ -1981,42 +1974,42 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "Impossibile connettersi a %s %s:" -#: methods/gpgv.cc:71 +#: methods/gpgv.cc:65 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Impossibile accedere al portachiavi: \"%s\"" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:101 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Elenco argomenti da Acquire::gpgv::Options troppo lungo. Uscita." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:205 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Errore interno: firma corretta, ma non è possibile determinare l'impronta " "della chiave." -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:210 msgid "At least one invalid signature was encountered." -msgstr "È stata trovata almeno una fima non valida." +msgstr "È stata trovata almeno una firma non valida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:214 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Impossibile esseguire \"%s\" per verificare la firma (forse gpgv non è " +"Impossibile eseguire \"%s\" per verificare la firma (forse gpgv non è " "installato)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:219 msgid "Unknown error executing gpgv" msgstr "Errore sconosciuto durante l'esecuzione di gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:250 msgid "The following signatures were invalid:\n" msgstr "Le seguenti firme non erano valide:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:257 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2034,80 +2027,80 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:379 +#: methods/http.cc:377 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:525 +#: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Ricevuta una singola riga header su %u caratteri" -#: methods/http.cc:533 +#: methods/http.cc:531 msgid "Bad header line" msgstr "Riga header non corretta" -#: methods/http.cc:552 methods/http.cc:559 +#: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:588 +#: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un header Content-Length non valido" -#: methods/http.cc:603 +#: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un header Content-Range non valido" -#: methods/http.cc:605 +#: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha un supporto del range non corretto" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:782 +#: methods/http.cc:774 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:787 +#: methods/http.cc:779 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:810 +#: methods/http.cc:802 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/http.cc:841 +#: methods/http.cc:833 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:869 +#: methods/http.cc:861 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:883 +#: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:885 +#: methods/http.cc:877 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Troncamento del file non riuscito" -#: methods/http.cc:1141 +#: methods/http.cc:1105 msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/http.cc:1158 methods/http.cc:1213 +#: methods/http.cc:1122 methods/http.cc:1177 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/http.cc:1305 +#: methods/http.cc:1229 msgid "Internal error" msgstr "Errore interno" @@ -2129,31 +2122,7 @@ msgstr "" "Mmap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il " "valore attuale è: %lu (man 5 apt.conf)." -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1014 #, c-format msgid "Selection %s not found" msgstr "Selezione %s non trovata" @@ -2378,7 +2347,7 @@ msgstr "Dipende" #: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "Predipende" +msgstr "Pre-dipende" #: apt-pkg/pkgcache.cc:224 msgid "Suggests" @@ -2588,7 +2557,7 @@ msgstr "Impossibile trovare un driver per il metodo %s." msgid "Method %s did not start correctly" msgstr "Il metodo %s non si è avviato correttamente" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:399 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio." @@ -2961,16 +2930,12 @@ msgstr "Preparazione alla rimozione completa di %s" msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:789 +#: apt-pkg/deb/dpkgpm.cc:791 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non " "è montato)\n" -#: apt-pkg/deb/debsystem.cc:100 -msgid "Not locked" -msgstr "" - #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Impossibile applicare la patch al file" @@ -2978,3 +2943,21 @@ msgstr "Impossibile applicare la patch al file" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" + +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Nessun pacchetto sorgente \"%s\", selezionato \"%s\" al suo posto\n" + +#~ msgid "%lid %lih %limin %lis" +#~ msgstr "%lig %lih %limin %lis" + +#~ msgid "%lih %limin %lis" +#~ msgstr "%lih %limin %lis" + +#~ msgid "%limin %lis" +#~ msgstr "%limin %lis" + +#~ msgid "%lis" +#~ msgstr "%lis" + +#~ msgid "Not locked" +#~ msgstr "Non bloccato" -- cgit v1.2.3-70-g09d2 From 81e9789b12374073e848c73c79e235f82c14df44 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Jun 2009 17:33:22 +0200 Subject: [ABI break] support '#' in apt.conf and /etc/apt/preferences (closes: #189866) --- apt-pkg/contrib/configuration.cc | 2 +- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- apt-pkg/policy.cc | 18 ++++++++++++++++-- apt-pkg/tagfile.cc | 21 ++++++++++++++++----- apt-pkg/tagfile.h | 5 ++++- debian/changelog | 5 +++++ methods/makefile | 2 +- 8 files changed, 45 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index a82311a3f..80584d3ea 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -582,7 +582,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, if (InQuote == true) continue; - if (*I == '/' && I + 1 != End && I[1] == '/') + if ((*I == '/' && I + 1 != End && I[1] == '/') || *I == '#') { End = I; break; diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 6d8693be9..165299253 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,7 +18,7 @@ // See the makefile #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 6 +#define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 087f17740..059f8532b 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -13,7 +13,7 @@ include ../buildlib/defaults.mak # methods/makefile - FIXME LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=4.7 +MAJOR=4.8 MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 8b083fd44..98576fc91 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -239,7 +239,21 @@ signed short pkgPolicy::GetPriority(pkgCache::PkgIterator const &Pkg) return 0; } /*}}}*/ - +// PreferenceSection class - Overriding the default TrimRecord method /*{{{*/ +// --------------------------------------------------------------------- +/* The preference file is a user generated file so the parser should + therefore be a bit more friendly by allowing comments and new lines + all over the place rather than forcing a special format */ +class PreferenceSection : public pkgTagSection +{ + void TrimRecord(bool BeforeRecord, const char* &End) + { + for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r' || Stop[0] == '#'); Stop++) + if (Stop[0] == '#') + Stop = (const char*) memchr(Stop,'\n',End-Stop); + } +}; + /*}}}*/ // ReadPinFile - Load the pin file into a Policy /*{{{*/ // --------------------------------------------------------------------- /* I'd like to see the preferences file store more than just pin information @@ -259,7 +273,7 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) if (_error->PendingError() == true) return false; - pkgTagSection Tags; + PreferenceSection Tags; while (TF.Step(Tags) == true) { string Name = Tags.FindS("Package"); diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 893cb8ee7..7c5d15a58 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -81,7 +81,7 @@ bool pkgTagFile::Resize() End = Start + EndSize; return true; } - + /*}}}*/ // TagFile::Step - Advance to the next section /*{{{*/ // --------------------------------------------------------------------- /* If the Section Scanner fails we refill the buffer and try again. @@ -212,10 +212,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) if (Stop == 0) return false; - + TagCount = 0; while (TagCount+1 < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End) { + TrimRecord(true,End); + // Start a new index and add it to the hash if (isspace(Stop[0]) == 0) { @@ -227,14 +229,14 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) if (Stop == 0) return false; - + for (; Stop+1 < End && Stop[1] == '\r'; Stop++); // Double newline marks the end of the record if (Stop+1 < End && Stop[1] == '\n') { Indexes[TagCount] = Stop - Section; - for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++); + TrimRecord(false,End); return true; } @@ -244,6 +246,16 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) return false; } /*}}}*/ +// TagSection::TrimRecord - Trim off any garbage before/after a record /*{{{*/ +// --------------------------------------------------------------------- +/* There should be exactly 2 newline at the end of the record, no more. */ +void pkgTagSection::TrimRecord(bool BeforeRecord, const char*& End) +{ + if (BeforeRecord == true) + return; + for (; Stop < End && (Stop[0] == '\n' || Stop[0] == '\r'); Stop++); +} + /*}}}*/ // TagSection::Trim - Trim off any trailing garbage /*{{{*/ // --------------------------------------------------------------------- /* There should be exactly 1 newline at the end of the buffer, no more. */ @@ -390,7 +402,6 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags, return true; } /*}}}*/ - // TFRewrite - Rewrite a control record /*{{{*/ // --------------------------------------------------------------------- /* This writes the control record to stdout rewriting it as necessary. The diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 6536932dd..321329a23 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -27,7 +27,6 @@ class pkgTagSection { const char *Section; - const char *Stop; // We have a limit of 256 tags per section. unsigned int Indexes[256]; @@ -35,6 +34,9 @@ class pkgTagSection unsigned int TagCount; + protected: + const char *Stop; + public: inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs.Section;}; @@ -49,6 +51,7 @@ class pkgTagSection bool Scan(const char *Start,unsigned long MaxLength); inline unsigned long size() const {return Stop - Section;}; void Trim(); + virtual void TrimRecord(bool BeforeRecord, const char* &End); inline unsigned int Count() const {return TagCount;}; inline void Get(const char *&Start,const char *&Stop,unsigned int I) const diff --git a/debian/changelog b/debian/changelog index 5d3a801a8..7947918a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apt (0.7.22) UNRELEASED; urgency=low + [ Christian Perrier ] * Documentation translations: - Fix a typo in apt-get(8) French translation. Closes: #525043 Thanks to Guillaume Delacour for spotting it. @@ -15,6 +16,10 @@ apt (0.7.22) UNRELEASED; urgency=low * Added translations - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007, #529730 + + [ David Kalnischkies ] + * [ABI break] support '#' in apt.conf and /etc/apt/preferences + (closes: #189866) -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/methods/makefile b/methods/makefile index 78bdbc96f..589f9fa1c 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.7 +LIB_APT_PKG_MAJOR = 4.8 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3-70-g09d2 From 8aea8c3f51ce84ed8d6d89682c0a989ac99c4796 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Fri, 12 Jun 2009 19:07:40 +0200 Subject: apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. --- apt-pkg/contrib/configuration.cc | 1 + debian/changelog | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 80584d3ea..48a5f0bff 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -521,6 +521,7 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional, F.getline(Buffer,sizeof(Buffer) / 2); Input += Buffer; + delete[] Buffer; } while (F.fail() && !F.eof()); diff --git a/debian/changelog b/debian/changelog index 7947918a4..ea935f144 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,10 @@ apt (0.7.22) UNRELEASED; urgency=low * [ABI break] support '#' in apt.conf and /etc/apt/preferences (closes: #189866) + [ Julian Andres Klode ] + * apt-pkg/contrib/configuration.cc: Fix a small memory leak in + ReadConfigFile. + -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 apt (0.7.21) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From f8ae7e8b3c5585888cbc0516b35131acec14ff05 Mon Sep 17 00:00:00 2001 From: "jak@debian.org" <> Date: Mon, 15 Jun 2009 14:57:01 +0200 Subject: Introduce support for the Enhances field. (Closes: #137583) --- apt-pkg/deb/deblistparser.cc | 2 ++ apt-pkg/pkgcache.cc | 4 ++-- apt-pkg/pkgcache.h | 2 +- debian/changelog | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 896d4d6d8..74fa6fab4 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -109,6 +109,8 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver) return false; if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false) return false; + if (ParseDepends(Ver,"Enhances",pkgCache::Dep::Enhances) == false) + return false; // Obsolete. if (ParseDepends(Ver,"Optional",pkgCache::Dep::Suggests) == false) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 4fbf42c4b..7a0d7376d 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -49,7 +49,7 @@ pkgCache::Header::Header() /* Whenever the structures change the major version should be bumped, whenever the generator changes the minor version should be bumped. */ - MajorVersion = 7; + MajorVersion = 8; MinorVersion = 0; Dirty = false; @@ -223,7 +223,7 @@ const char *pkgCache::DepType(unsigned char Type) { const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"), _("Recommends"),_("Conflicts"),_("Replaces"), - _("Obsoletes"),_("Breaks")}; + _("Obsoletes"),_("Breaks"), _("Enhances")}; if (Type < sizeof(Types)/sizeof(*Types)) return Types[Type]; return ""; diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index 759e9a225..f2c032eb4 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -70,7 +70,7 @@ class pkgCache struct Dep { enum DepType {Depends=1,PreDepends=2,Suggests=3,Recommends=4, - Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8}; + Conflicts=5,Replaces=6,Obsoletes=7,DpkgBreaks=8,Enhances=9}; enum DepCompareOp {Or=0x10,NoOp=0,LessEq=0x1,GreaterEq=0x2,Less=0x3, Greater=0x4,Equals=0x5,NotEquals=0x6}; }; diff --git a/debian/changelog b/debian/changelog index ea935f144..ecba3f215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ apt (0.7.22) UNRELEASED; urgency=low [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. + * Introduce support for the Enhances field. (Closes: #137583) -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 -- cgit v1.2.3-70-g09d2 From 55a5a46c235a30bf024fb2301066553953701cc5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 29 Jun 2009 16:55:49 +0200 Subject: support running "--simulate" as user --- cmdline/apt-get.cc | 13 ++++++++++++- debian/changelog | 1 + doc/apt-get.8.xml | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 028f371b5..faad2ed6b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2788,7 +2788,18 @@ int main(int argc,const char *argv[]) ShowHelp(CmdL); return 0; } - + + // simulate user-friendly if apt-get has no root privileges + if (getuid() != 0 && _config->FindB("APT::Get::Simulate") == true) + { + cout << _("NOTE: This is only a simulation!\n" + " apt-get needs root privileges for real execution.\n" + " Keep also in mind that locking is deactivated,\n" + " so don't depend on the relevance to the real current situation!" + ) << std::endl; + _config->Set("Debug::NoLocking",true); + } + // Deal with stdout not being a tty if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1) _config->Set("quiet","1"); diff --git a/debian/changelog b/debian/changelog index 28bc54108..f1cb7bd0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ apt (0.7.22) UNRELEASED; urgency=low * [ABI break] support '#' in apt.conf and /etc/apt/preferences (closes: #189866) * [ABI break] Allow pinning by codename (closes: #97564) + * support running "--simulate" as user [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index c63b2a6c6..e7f6d7094 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -363,6 +363,11 @@ actually change the system. Configuration Item: APT::Get::Simulate. + Simulation run as user will deactivate locking (Debug::NoLocking) + automatical and display a notice indicating that this is only a simulation. + Neigther NoLocking nor the notice will be triggered if run as root (root should know what + he is doing without further warnings by apt-get). + Simulate prints out a series of lines each one representing a dpkg operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with -- cgit v1.2.3-70-g09d2 From af29ffb44d95dfb0f7b0c1835e2e501313f74723 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 29 Jun 2009 18:00:54 +0200 Subject: * add depth information to the debug output and show what depends type triggers a autoinst (closes: #458389) * add debug::pkgDepCache::Marker with more detailed debug output (closes: #87520) --- apt-pkg/cacheiterators.h | 13 +- apt-pkg/depcache.cc | 47 +++++-- apt-pkg/depcache.h | 10 +- apt-pkg/pkgcache.cc | 51 ++++++++ debian/changelog | 4 + doc/apt.conf.5.xml | 21 ++++ doc/examples/configure-index | 1 + po/apt-all.pot | 293 +++++++++++++++++++++++++------------------ 8 files changed, 298 insertions(+), 142 deletions(-) (limited to 'debian') diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index 63f9de8fc..cf79b3a6b 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -80,7 +80,13 @@ class pkgCache::PkgIterator inline PrvIterator ProvidesList() const; inline unsigned long Index() const {return Pkg - Owner->PkgP;}; OkState State() const; - + + //Nice printable representation + friend std::ostream& operator<<(std::ostream& out, pkgCache::PkgIterator Pkg); + + const char *CandVersion() const; + const char *CurVersion() const; + // Constructors inline PkgIterator(pkgCache &Owner,Package *Trg) : Pkg(Trg), Owner(&Owner), HashIndex(0) @@ -111,7 +117,10 @@ class pkgCache::VerIterator inline bool operator ==(const VerIterator &B) const {return Ver == B.Ver;}; inline bool operator !=(const VerIterator &B) const {return Ver != B.Ver;}; int CompareVer(const VerIterator &B) const; - + + // Testing + inline bool IsGood() const { return Ver && Owner && ! end();}; + // Accessors inline Version *operator ->() {return Ver;}; inline Version const *operator ->() const {return Ver;}; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 2411bfe89..e9ef9cedc 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -47,6 +47,13 @@ ConfigValueInSubTree(const char* SubTree, const char *needle) return false; } +std::string OutputInDepth(const unsigned long Depth) +{ + std::string output = ""; + for(unsigned long d=Depth; d > 0; d--) + output += " "; + return output; +} pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : cache(cache), released(false) @@ -83,6 +90,8 @@ pkgDepCache::ActionGroup::~ActionGroup() pkgDepCache::pkgDepCache(pkgCache *pCache,Policy *Plcy) : group_level(0), Cache(pCache), PkgState(0), DepState(0) { + DebugMarker = _config->FindB("Debug::pkgDepCache::Marker", false); + DebugAutoInstall = _config->FindB("Debug::pkgDepCache::AutoInstall", false); delLocalPolicy = 0; LocalPolicy = Plcy; if (LocalPolicy == 0) @@ -705,7 +714,8 @@ void pkgDepCache::Update(PkgIterator const &Pkg) // DepCache::MarkKeep - Put the package in the keep state /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) +void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser, + unsigned long Depth) { // Simplifies other routines. if (Pkg.end() == true) @@ -746,6 +756,9 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) P.Flags &= ~Flag::Auto; #endif + if (DebugMarker == true) + std::clog << OutputInDepth(Depth) << "MarkKeep " << Pkg << std::endl; + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -765,7 +778,8 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser) // DepCache::MarkDelete - Put the package in the delete state /*{{{*/ // --------------------------------------------------------------------- /* */ -void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) +void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, + unsigned long Depth) { // Simplifies other routines. if (Pkg.end() == true) @@ -787,6 +801,9 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge) if (Pkg->VersionList == 0) return; + if (DebugMarker == true) + std::clog << OutputInDepth(Depth) << "MarkDelete " << Pkg << std::endl; + RemoveSizes(Pkg); RemoveStates(Pkg); @@ -826,7 +843,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, P.CandidateVer == (Version *)Pkg.CurrentVer())) { if (P.CandidateVer == (Version *)Pkg.CurrentVer() && P.InstallVer == 0) - MarkKeep(Pkg, false, FromUser); + MarkKeep(Pkg, false, FromUser, Depth+1); return; } @@ -868,6 +885,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (AutoInst == false) return; + if (DebugMarker == true) + std::clog << OutputInDepth(Depth) << "MarkInstall " << Pkg << std::endl; + DepIterator Dep = P.InstVerIter(*this).DependsList(); for (; Dep.end() != true;) { @@ -937,12 +957,12 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } if(isNewImportantDep) - if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) - std::clog << "new important dependency: " + if(DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) << "new important dependency: " << Start.TargetPkg().Name() << std::endl; if(isPreviouslySatisfiedImportantDep) - if(_config->FindB("Debug::pkgDepCache::AutoInstall", false) == true) - std::clog << "previously satisfied important dependency on " + if(DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) << "previously satisfied important dependency on " << Start.TargetPkg().Name() << std::endl; // skip important deps if the package is already installed @@ -993,15 +1013,16 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, if (InstPkg.end() == false) { - if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) - std::clog << "Installing " << InstPkg.Name() - << " as dep of " << Pkg.Name() + if(DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name() + << " as " << Start.DepType() << " of " << Pkg.Name() << std::endl; // now check if we should consider it a automatic dependency or not if(Pkg.Section() && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", Pkg.Section())) { - if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true) - std::clog << "Setting NOT as auto-installed (direct dep of pkg in APT::Never-MarkAuto-Sections)" << std::endl; + if(DebugAutoInstall == true) + std::clog << OutputInDepth(Depth) << "Setting NOT as auto-installed (direct " + << Start.DepType() << " of pkg in APT::Never-MarkAuto-Sections)" << std::endl; MarkInstall(InstPkg,true,Depth + 1, true); } else @@ -1028,7 +1049,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgIterator Pkg = Ver.ParentPkg(); if (Start->Type != Dep::DpkgBreaks) - MarkDelete(Pkg); + MarkDelete(Pkg,false,Depth + 1); else if (PkgState[Pkg->ID].CandidateVer != *I) MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index f41ad17e9..2d33e21d7 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -294,7 +294,10 @@ class pkgDepCache : protected pkgCache::Namespace unsigned long iBrokenCount; unsigned long iPolicyBrokenCount; unsigned long iBadCount; - + + bool DebugMarker; + bool DebugAutoInstall; + Policy *delLocalPolicy; // For memory clean up.. Policy *LocalPolicy; @@ -387,8 +390,9 @@ class pkgDepCache : protected pkgCache::Namespace */ // @{ void MarkKeep(PkgIterator const &Pkg, bool Soft = false, - bool FromUser = true); - void MarkDelete(PkgIterator const &Pkg,bool Purge = false); + bool FromUser = true, unsigned long Depth = 0); + void MarkDelete(PkgIterator const &Pkg, bool Purge = false, + unsigned long Depth = 0); void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, unsigned long Depth = 0, bool FromUser = true, bool ForceImportantDeps = false); diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 81a254483..4e10093a8 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -21,6 +21,7 @@ /*}}}*/ // Include Files /*{{{*/ #include +#include #include #include #include @@ -290,6 +291,56 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const return NeedsNothing; } /*}}}*/ +// PkgIterator::CandVersion - Returns the candidate version string /*{{{*/ +// --------------------------------------------------------------------- +/* Return string representing of the candidate version. */ +const char * +pkgCache::PkgIterator::CandVersion() const +{ + //TargetVer is empty, so don't use it. + VerIterator version = pkgPolicy::pkgPolicy(Owner).GetCandidateVer(*this); + if (version.IsGood()) + return version.VerStr(); + return 0; +}; + /*}}}*/ +// PkgIterator::CurVersion - Returns the current version string /*{{{*/ +// --------------------------------------------------------------------- +/* Return string representing of the current version. */ +const char * +pkgCache::PkgIterator::CurVersion() const +{ + VerIterator version = CurrentVer(); + if (version.IsGood()) + return CurrentVer().VerStr(); + return 0; +}; + /*}}}*/ +// ostream operator to handle string representation of a package /*{{{*/ +// --------------------------------------------------------------------- +/* Output name < cur.rent.version -> candid.ate.version | new.est.version > (section) + Note that the characters <|>() are all literal above. Versions will be ommited + if they provide no new information (e.g. there is no newer version than candidate) + If no version and/or section can be found "none" is used. */ +std::ostream& +operator<<(ostream& out, pkgCache::PkgIterator Pkg) +{ + if (Pkg.end() == true) + return out << "invalid package"; + + string current = string(Pkg.CurVersion() == 0 ? "none" : Pkg.CurVersion()); + string candidate = string(Pkg.CandVersion() == 0 ? "none" : Pkg.CandVersion()); + string newest = string(Pkg.VersionList().end() ? "none" : Pkg.VersionList().VerStr()); + + out << Pkg.Name() << " < " << current; + if (current != candidate) + out << " -> " << candidate; + if ( newest != "none" && candidate != newest) + out << " | " << newest; + out << " > ( " << string(Pkg.Section()==0?"none":Pkg.Section()) << " )"; + return out; +} + /*}}}*/ // DepIterator::IsCritical - Returns true if the dep is important /*{{{*/ // --------------------------------------------------------------------- /* Currently critical deps are defined as depends, predepends and diff --git a/debian/changelog b/debian/changelog index f1cb7bd0c..bb75ad8af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,10 @@ apt (0.7.22) UNRELEASED; urgency=low (closes: #189866) * [ABI break] Allow pinning by codename (closes: #97564) * support running "--simulate" as user + * add depth information to the debug output and show what depends + type triggers a autoinst (closes: #458389) + * add debug::pkgDepCache::Marker with more detailed debug output + (closes: #87520) [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index fb2be9a28..841bb8f66 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -679,6 +679,27 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + + Debug::pkgDepCache::Marker + + + Generate debug messages describing which package is marked + as keep/install/remove while the ProblemResolver does his work. + Each addition or deletion may trigger additional actions; + they are shown indented two additional space under the original entry. + The format for each line is MarkKeep, + MarkDelete or MarkInstall followed by + package-name <a.b.c -> d.e.f | x.y.z> (section) + where a.b.c is the current version of the package, + d.e.f is the version considered for installation and + x.y.z is a newer version, but not considered for installation + (because of a low pin score). The later two can be omitted if there is none or if + it is the same version as the installed. + section is the name of the section the package appears in. + + + + Debug::pkgInitConfig diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5f29a2d3f..dd8d667db 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -289,6 +289,7 @@ Debug { pkgProblemResolver "false"; pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies + pkgDepCache::Marker "false"; pkgAcquire "false"; pkgAcquire::Worker "false"; pkgAcquire::Auth "false"; diff --git a/po/apt-all.pot b/po/apt-all.pot index ec87b27a3..2aa99cfa2 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-12 22:07+0100\n" +"POT-Creation-Date: 2009-06-29 17:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -156,7 +156,7 @@ msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -713,11 +713,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -746,7 +746,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -780,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -789,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 msgid "Download complete and in download only mode" msgstr "" @@ -881,29 +881,34 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1307 +#, c-format +msgid "No source package '%s' picking '%s' instead\n" +msgstr "" + +#: cmdline/apt-get.cc:1345 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1358 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1410 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1435 +#: cmdline/apt-get.cc:1442 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1444 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1449 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -919,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1456 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1468 +#: cmdline/apt-get.cc:1475 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1530 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:1668 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1699 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1712 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1715 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1727 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -969,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1745 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1774 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1863 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1857 +#: cmdline/apt-get.cc:1864 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1892 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1900 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2075 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2154 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2182 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2188 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2191 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2197 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2228 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2268 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2269 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2279 +#: cmdline/apt-get.cc:2286 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2305 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2321 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2349 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2369 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2421 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2467 +#: cmdline/apt-get.cc:2474 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2503 +#: cmdline/apt-get.cc:2510 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2537 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2551 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2555 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2587 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2628 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1130,7 +1135,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1158,6 +1163,14 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +#: cmdline/apt-get.cc:2795 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "" @@ -1373,7 +1386,7 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -1666,7 +1679,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1750,38 +1763,38 @@ msgstr "" msgid "Unable to connect to %s %s:" msgstr "" -#: methods/gpgv.cc:65 +#: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:101 +#: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:214 +#: methods/gpgv.cc:232 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1797,80 +1810,80 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 +#: methods/http.cc:379 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 +#: methods/http.cc:525 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 +#: methods/http.cc:533 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:552 methods/http.cc:559 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 +#: methods/http.cc:588 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 +#: methods/http.cc:605 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 +#: methods/http.cc:629 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 +#: methods/http.cc:782 msgid "Select failed" msgstr "" -#: methods/http.cc:779 +#: methods/http.cc:787 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 +#: methods/http.cc:810 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 +#: methods/http.cc:841 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 +#: methods/http.cc:869 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 +#: methods/http.cc:883 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:885 msgid "Error reading from server" msgstr "" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "" -#: methods/http.cc:1105 +#: methods/http.cc:1141 msgid "Bad header data" msgstr "" -#: methods/http.cc:1122 methods/http.cc:1177 +#: methods/http.cc:1158 methods/http.cc:1213 msgid "Connection failed" msgstr "" -#: methods/http.cc:1229 +#: methods/http.cc:1305 msgid "Internal error" msgstr "" @@ -1890,7 +1903,31 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/strutl.cc:1014 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "" + +#: apt-pkg/contrib/strutl.cc:1018 #, c-format msgid "Selection %s not found" msgstr "" @@ -1905,42 +1942,42 @@ msgstr "" msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:699 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:739 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:746 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:759 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:810 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2083,101 +2120,105 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:131 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:160 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:181 apt-pkg/depcache.cc:200 apt-pkg/depcache.cc:204 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:228 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:234 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2309,7 +2350,7 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2340,16 +2381,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:281 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:303 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:311 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2660,10 +2701,14 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:791 +#: apt-pkg/deb/dpkgpm.cc:789 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "" -- cgit v1.2.3-70-g09d2 From 8b4894fe9e917409f3ea4cbb189c1648f2cea4df Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 29 Jun 2009 18:07:30 +0200 Subject: * add Debug::pkgDepCache::Marker with more detailed debug output * add Debug::pkgProblemResolver::ShowScores and make the scores adjustable --- apt-pkg/algorithms.cc | 91 +++++++++++++++++++++++++++++++------------- debian/changelog | 4 +- doc/apt.conf.5.xml | 11 ++++++ doc/examples/configure-index | 1 + po/apt-all.pot | 8 ++-- 5 files changed, 84 insertions(+), 31 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index bd33d5ef1..4b1bb4430 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -489,6 +489,34 @@ void pkgProblemResolver::MakeScores() unsigned long Size = Cache.Head().PackageCount; memset(Scores,0,sizeof(*Scores)*Size); + // Important Required Standard Optional Extra + signed short PrioMap[] = { + 0, + _config->FindI("pkgProblemResolver::Scores::Important",3), + _config->FindI("pkgProblemResolver::Scores::Required",2), + _config->FindI("pkgProblemResolver::Scores::Standard",1), + _config->FindI("pkgProblemResolver::Scores::Optional",-1), + _config->FindI("pkgProblemResolver::Scores::Extra",-2) + }; + signed short PrioEssentials = _config->FindI("pkgProblemResolver::Scores::Essentials",100); + signed short PrioInstalledAndNotObsolete = _config->FindI("pkgProblemResolver::Scores::NotObsolete",1); + signed short PrioDepends = _config->FindI("pkgProblemResolver::Scores::Depends",1); + signed short AddProtected = _config->FindI("pkgProblemResolver::Scores::AddProtected",10000); + signed short AddEssential = _config->FindI("pkgProblemResolver::Scores::AddEssential",5000); + + if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true) + clog << "Settings used to calculate pkgProblemResolver::Scores::" << endl + << " Important => " << PrioMap[1] << endl + << " Required => " << PrioMap[2] << endl + << " Standard => " << PrioMap[3] << endl + << " Optional => " << PrioMap[4] << endl + << " Extra => " << PrioMap[5] << endl + << " Essentials => " << PrioEssentials << endl + << " InstalledAndNotObsolete => " << PrioInstalledAndNotObsolete << endl + << " Depends => " << PrioDepends << endl + << " AddProtected => " << AddProtected << endl + << " AddEssential => " << AddEssential << endl; + // Generate the base scores for a package based on its properties for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { @@ -502,11 +530,9 @@ void pkgProblemResolver::MakeScores() to allow an obsolete essential packages to be removed by a conflicts on a powerfull normal package (ie libc6) */ if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Score += 100; + Score += PrioEssentials; // We transform the priority - // Important Required Standard Optional Extra - signed short PrioMap[] = {0,3,2,1,-1,-2}; if (Cache[I].InstVerIter(Cache)->Priority <= 5) Score += PrioMap[Cache[I].InstVerIter(Cache)->Priority]; @@ -515,7 +541,7 @@ void pkgProblemResolver::MakeScores() if those are not obsolete */ if (I->CurrentVer != 0 && Cache[I].CandidateVer != 0 && Cache[I].CandidateVerIter(Cache).Downloadable()) - Score += 1; + Score += PrioInstalledAndNotObsolete; } // Now that we have the base scores we go and propogate dependencies @@ -527,7 +553,7 @@ void pkgProblemResolver::MakeScores() for (pkgCache::DepIterator D = Cache[I].InstVerIter(Cache).DependsList(); D.end() == false; D++) { if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) - Scores[D.TargetPkg()->ID]++; + Scores[D.TargetPkg()->ID]+= PrioDepends; } } @@ -572,10 +598,10 @@ void pkgProblemResolver::MakeScores() for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) { if ((Flags[I->ID] & Protected) != 0) - Scores[I->ID] += 10000; + Scores[I->ID] += AddProtected; if ((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Scores[I->ID] += 5000; - } + Scores[I->ID] += AddEssential; + } } /*}}}*/ // ProblemResolver::DoUpgrade - Attempt to upgrade this package /*{{{*/ @@ -751,19 +777,21 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) *PEnd++ = I; This = this; qsort(PList,PEnd - PList,sizeof(*PList),&ScoreSort); - -/* for (pkgCache::Package **K = PList; K != PEnd; K++) - if (Scores[(*K)->ID] != 0) - { - pkgCache::PkgIterator Pkg(Cache,*K); - clog << Scores[(*K)->ID] << ' ' << Pkg.Name() << - ' ' << (pkgCache::Version *)Pkg.CurrentVer() << ' ' << - Cache[Pkg].InstallVer << ' ' << Cache[Pkg].CandidateVer << endl; - } */ + + if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true) + { + clog << "Show Scores" << endl; + for (pkgCache::Package **K = PList; K != PEnd; K++) + if (Scores[(*K)->ID] != 0) + { + pkgCache::PkgIterator Pkg(Cache,*K); + clog << Scores[(*K)->ID] << ' ' << Pkg << std::endl; + } + } if (Debug == true) clog << "Starting 2" << endl; - + /* Now consider all broken packages. For each broken package we either remove the package or fix it's problem. We do this once, it should not be possible for a loop to form (that is a < b < c and fixing b by @@ -878,7 +906,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } if (Debug == true) - clog << "Package " << I.Name() << " has broken dep on " << Start.TargetPkg().Name() << endl; + clog << "Package " << I.Name() << " has broken " << Start.DepType() << " on " << Start.TargetPkg().Name() << endl; /* Look across the version list. If there are no possible targets then we keep the package and bail. This is necessary @@ -1137,9 +1165,6 @@ bool pkgProblemResolver::ResolveByKeep() unsigned long Size = Cache.Head().PackageCount; - if (Debug == true) - clog << "Entering ResolveByKeep" << endl; - MakeScores(); /* We have to order the packages so that the broken fixing pass @@ -1152,7 +1177,21 @@ bool pkgProblemResolver::ResolveByKeep() *PEnd++ = I; This = this; qsort(PList,PEnd - PList,sizeof(*PList),&ScoreSort); - + + if (_config->FindB("Debug::pkgProblemResolver::ShowScores",false) == true) + { + clog << "Show Scores" << endl; + for (pkgCache::Package **K = PList; K != PEnd; K++) + if (Scores[(*K)->ID] != 0) + { + pkgCache::PkgIterator Pkg(Cache,*K); + clog << Scores[(*K)->ID] << ' ' << Pkg << std::endl; + } + } + + if (Debug == true) + clog << "Entering ResolveByKeep" << endl; + // Consider each broken package pkgCache::Package **LastStop = 0; for (pkgCache::Package **K = PList; K != PEnd; K++) @@ -1198,8 +1237,8 @@ bool pkgProblemResolver::ResolveByKeep() while (true) { if (Debug == true) - clog << "Package " << I.Name() << " has broken dep on " << Start.TargetPkg().Name() << endl; - + clog << "Package " << I.Name() << " has broken " << Start.DepType() << " on " << Start.TargetPkg().Name() << endl; + // Look at all the possible provides on this package SPtrArray VList = Start.AllTargets(); for (pkgCache::Version **V = VList; *V != 0; V++) @@ -1215,7 +1254,7 @@ bool pkgProblemResolver::ResolveByKeep() if ((Flags[I->ID] & Protected) == 0) { if (Debug == true) - clog << " Keeping Package " << Pkg.Name() << " due to dep" << endl; + clog << " Keeping Package " << Pkg.Name() << " due to " << Start.DepType() << endl; Cache.MarkKeep(Pkg, false, false); } diff --git a/debian/changelog b/debian/changelog index bb75ad8af..d1959c074 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,10 @@ apt (0.7.22) UNRELEASED; urgency=low * support running "--simulate" as user * add depth information to the debug output and show what depends type triggers a autoinst (closes: #458389) - * add debug::pkgDepCache::Marker with more detailed debug output + * add Debug::pkgDepCache::Marker with more detailed debug output (closes: #87520) + * add Debug::pkgProblemResolver::ShowScores and make the scores + adjustable [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 841bb8f66..eece75d28 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -777,6 +777,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + + Debug::pkgProblemResolver::ShowScores + + + Display a list of all installed packages with their calculated score + used by the pkgProblemResolver. The description of the package + is the same as described in Debug::pkgDepCache::Marker + + + + Debug::sourceList diff --git a/doc/examples/configure-index b/doc/examples/configure-index index dd8d667db..cea0dcc09 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -288,6 +288,7 @@ DPkg Debug { pkgProblemResolver "false"; + pkgProblemResolver::ShowScores "false"; pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies pkgDepCache::Marker "false"; pkgAcquire "false"; diff --git a/po/apt-all.pot b/po/apt-all.pot index 2aa99cfa2..a1d7cb99d 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -780,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1388 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -2302,17 +2302,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1135 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1137 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1414 apt-pkg/algorithms.cc:1416 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -- cgit v1.2.3-70-g09d2 From 9964a721855b74b4f6008d30ebc637198776ca04 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 29 Jun 2009 18:13:23 +0200 Subject: do not write state file in simulate mode (closes: #433007) --- cmdline/apt-get.cc | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index faad2ed6b..93b3a83dc 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1870,7 +1870,8 @@ bool DoInstall(CommandLine &CmdL) // cache.commit() if (AutoMarkChanged > 0 && Cache->DelCount() == 0 && Cache->InstCount() == 0 && - Cache->BadCount() == 0) + Cache->BadCount() == 0 && + _config->FindB("APT::Get::Simulate",false) == false) Cache->writeStateFile(NULL); // See if we need to prompt diff --git a/debian/changelog b/debian/changelog index d1959c074..dd79639c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ apt (0.7.22) UNRELEASED; urgency=low (closes: #87520) * add Debug::pkgProblemResolver::ShowScores and make the scores adjustable + * do not write state file in simulate mode (closes: #433007) [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in -- cgit v1.2.3-70-g09d2 From 2d403b92011c6e4a317a48284e7c68952ce5ddcd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 29 Jun 2009 18:20:58 +0200 Subject: add hook for auto-install (closes: #470035) --- apt-pkg/depcache.cc | 20 ++++++++++++++++++++ apt-pkg/depcache.h | 13 +++++++++++++ debian/changelog | 1 + 3 files changed, 34 insertions(+) (limited to 'debian') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index e9ef9cedc..fcc6f4a4e 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -853,6 +853,17 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, // We dont even try to install virtual packages.. if (Pkg->VersionList == 0) return; + + /* if the user doesn't request directly the install we have to check + if this install will conflict with any rule a application + like apt-get or aptitude might has set (for the user) + e.g. forbidden versions, holds or other magic stuff */ + if(FromUser == false && !IsAutoInstallOk(Pkg, Depth)) + { + MarkKeep(Pkg, false, FromUser, Depth); + return; + } + /* Target the candidate version and remove the autoflag. We reset the autoflag below if this was called recursively. Otherwise the user should have the ability to de-auto a package by changing its state */ @@ -1059,6 +1070,15 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } /*}}}*/ +// DepCache::IsAutoInstallOk - check if it is to install this package /*{{{*/ +// --------------------------------------------------------------------- +/* The default implementation is useless, but an application using this + library can override this method to control the MarkInstall behaviour */ +bool pkgDepCache::IsAutoInstallOk(const PkgIterator &Pkg, unsigned long Depth) +{ + return true; +} + /*}}}*/ // DepCache::SetReInstall - Set the reinstallation flag /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 2d33e21d7..e6110ea19 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -396,6 +396,19 @@ class pkgDepCache : protected pkgCache::Namespace void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, unsigned long Depth = 0, bool FromUser = true, bool ForceImportantDeps = false); + + /** \return \b true if it's OK for MarkInstall to recursively + * install the given package automatically. + * + * \param Pkg the package that MarkInstall wants to install. + * + * \param Depth output depth used for the debugging messages + * + * The default implementation unconditionally returns \b true. + */ + virtual bool IsAutoInstallOk(const PkgIterator &Pkg, + unsigned long Depth = 0); + void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); diff --git a/debian/changelog b/debian/changelog index dd79639c6..aadaa0856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ apt (0.7.22) UNRELEASED; urgency=low * add Debug::pkgProblemResolver::ShowScores and make the scores adjustable * do not write state file in simulate mode (closes: #433007) + * add hook for auto-install (closes: #470035) [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in -- cgit v1.2.3-70-g09d2 From d6ebeb21ddb3d8f3d485562cdac0e0878d50c936 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 29 Jun 2009 18:40:42 +0200 Subject: * support IsAutoInstallOk in the resolver too * honor the dpkg hold state in IsAutoInstallOk (closes: #64141) --- apt-pkg/algorithms.cc | 28 ++++++++++++++++++++-------- apt-pkg/depcache.cc | 2 +- debian/changelog | 4 ++++ 3 files changed, 25 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 4b1bb4430..db370a044 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -985,15 +985,27 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Consider other options if (InOr == false) { - if (Debug == true) - clog << " Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; - Cache.MarkDelete(I); - if (Counter > 1) + if (Cache.IsAutoInstallOk(I) == true) { - if (Scores[Pkg->ID] > Scores[I->ID]) - Scores[I->ID] = Scores[Pkg->ID]; - } - } + if (Debug == true) + clog << " Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; + Cache.MarkDelete(I); + if (Counter > 1) + { + if (Scores[Pkg->ID] > Scores[I->ID]) + Scores[I->ID] = Scores[Pkg->ID]; + } + } else { + /* The dependency of the TargetPkg would be satisfiable with I but it is + forbidden to install I automatical, so anything we can do is hold + back the TargetPkg. + */ + if (Debug == true) + clog << " Hold back " << Start.TargetPkg().Name() << + " rather than change denied AutoInstall " << I.Name() << endl; + Cache.MarkKeep(Start.TargetPkg()); + } + } } } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 9f734cca2..8af6941cf 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1069,7 +1069,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, library can override this method to control the MarkInstall behaviour */ bool pkgDepCache::IsAutoInstallOk(const PkgIterator &Pkg, unsigned long Depth) { - return true; + return (Pkg->SelectedState != pkgCache::State::Hold); } /*}}}*/ // DepCache::SetReInstall - Set the reinstallation flag /*{{{*/ diff --git a/debian/changelog b/debian/changelog index aadaa0856..8610b6376 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,7 +30,11 @@ apt (0.7.22) UNRELEASED; urgency=low adjustable * do not write state file in simulate mode (closes: #433007) * add hook for auto-install (closes: #470035) + * support IsAutoInstallOk in the resolver too + [ Michael Vogt ] + * honor the dpkg hold state in IsAutoInstallOk (closes: #64141) + [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. -- cgit v1.2.3-70-g09d2 From d116d66834b77cc77750c89969c43e0ba9d5807e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 30 Jun 2009 13:52:52 +0200 Subject: merge the AutoInstOk patch from debian-experimental --- apt-pkg/algorithms.cc | 2 +- apt-pkg/depcache.cc | 35 ++++++++++++++++------------------- apt-pkg/depcache.h | 26 ++++++++++++++------------ debian/changelog | 2 +- 4 files changed, 32 insertions(+), 33 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index db370a044..2ad064319 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -985,7 +985,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Consider other options if (InOr == false) { - if (Cache.IsAutoInstallOk(I) == true) + if (Cache.AutoInstOk(I, Cache[I].CandidateVerIter(Cache),Start) == true) { if (Debug == true) clog << " Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 8af6941cf..b1b8f970f 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -846,17 +846,6 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, // We dont even try to install virtual packages.. if (Pkg->VersionList == 0) return; - - /* if the user doesn't request directly the install we have to check - if this install will conflict with any rule a application - like apt-get or aptitude might has set (for the user) - e.g. forbidden versions, holds or other magic stuff */ - if(FromUser == false && !IsAutoInstallOk(Pkg, Depth)) - { - MarkKeep(Pkg, false, FromUser, Depth); - return; - } - /* Target the candidate version and remove the autoflag. We reset the autoflag below if this was called recursively. Otherwise the user should have the ability to de-auto a package by changing its state */ @@ -1015,7 +1004,8 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } - if (InstPkg.end() == false) + if (InstPkg.end() == false && + AutoInstOk(InstPkg, (*this)[InstPkg].CandidateVerIter(*this), Start)) { if(DebugAutoInstall == true) std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name() @@ -1053,21 +1043,28 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgIterator Pkg = Ver.ParentPkg(); if (Start->Type != Dep::DpkgBreaks) - MarkDelete(Pkg,false,Depth + 1); + { + if(AutoInstOk(Pkg, VerIterator(*this), Start)) + MarkDelete(Pkg); + } else - if (PkgState[Pkg->ID].CandidateVer != *I) + if (PkgState[Pkg->ID].CandidateVer != *I && + AutoInstOk(Pkg, VerIterator(*this, PkgState[Pkg->ID].CandidateVer), Start)) MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); } continue; } } } - /*}}}*/ -// DepCache::IsAutoInstallOk - check if it is to install this package /*{{{*/ + +// DepCache::AutoInstOk - check if it is to install this package /*{{{*/ // --------------------------------------------------------------------- -/* The default implementation is useless, but an application using this - library can override this method to control the MarkInstall behaviour */ -bool pkgDepCache::IsAutoInstallOk(const PkgIterator &Pkg, unsigned long Depth) +/* The default implementation just honors dpkg hold + But an application using this library can override this method + to control the MarkInstall behaviour */ +bool pkgDepCache::AutoInstOk(const PkgIterator &Pkg, + const VerIterator &v, + const DepIterator &d) { return (Pkg->SelectedState != pkgCache::State::Hold); } diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index e6110ea19..10f9c1091 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -363,6 +363,20 @@ class pkgDepCache : protected pkgCache::Namespace */ virtual bool MarkFollowsSuggests(); + /** \return \b true if it's OK for MarkInstall to recursively + * install the given version of the given package. + * + * \param p the package that MarkInstall wants to install. + * \param v the version being installed, or an end iterator + * if p is being removed. + * \param d the dependency being fixed. + * + * The default implementation unconditionally returns \b true. + */ + virtual bool AutoInstOk(const PkgIterator &p, + const VerIterator &v, + const DepIterator &d); + /** \brief Update the Marked and Garbage fields of all packages. * * This routine is implicitly invoked after all state manipulators @@ -397,18 +411,6 @@ class pkgDepCache : protected pkgCache::Namespace unsigned long Depth = 0, bool FromUser = true, bool ForceImportantDeps = false); - /** \return \b true if it's OK for MarkInstall to recursively - * install the given package automatically. - * - * \param Pkg the package that MarkInstall wants to install. - * - * \param Depth output depth used for the debugging messages - * - * The default implementation unconditionally returns \b true. - */ - virtual bool IsAutoInstallOk(const PkgIterator &Pkg, - unsigned long Depth = 0); - void SetReInstall(PkgIterator const &Pkg,bool To); void SetCandidateVersion(VerIterator TargetVer); diff --git a/debian/changelog b/debian/changelog index 8610b6376..333640b18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,7 +33,7 @@ apt (0.7.22) UNRELEASED; urgency=low * support IsAutoInstallOk in the resolver too [ Michael Vogt ] - * honor the dpkg hold state in IsAutoInstallOk (closes: #64141) + * honor the dpkg hold state in AutoInstOk (closes: #64141) [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in -- cgit v1.2.3-70-g09d2 From 7a9f09bd66d51b92bb68f07e7fbc111df6206c93 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 30 Jun 2009 14:11:31 +0200 Subject: merged r1811..1815 from lp:~donkult/apt/experimental --- apt-pkg/deb/debmetaindex.cc | 7 ++ apt-pkg/deb/debmetaindex.h | 1 + apt-pkg/deb/debsrcrecords.cc | 8 ++ apt-pkg/deb/debsrcrecords.h | 1 + apt-pkg/metaindex.h | 8 +- cmdline/apt-get.cc | 3 + debian/control | 2 +- po/apt-all.pot | 270 +++++++++++++++++++++---------------------- 8 files changed, 163 insertions(+), 137 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index ee035191f..f3ab6960c 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -115,6 +115,13 @@ debReleaseIndex::debReleaseIndex(string URI,string Dist) this->Type = "deb"; } +debReleaseIndex::~debReleaseIndex() +{ + for (vector::const_iterator I = SectionEntries.begin(); + I != SectionEntries.end(); I++) + delete *I; +} + vector * debReleaseIndex::ComputeIndexTargets() const { vector * IndexTargets = new vector ; diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h index c021a1b5a..8e6a1463b 100644 --- a/apt-pkg/deb/debmetaindex.h +++ b/apt-pkg/deb/debmetaindex.h @@ -22,6 +22,7 @@ class debReleaseIndex : public metaIndex { public: debReleaseIndex(string URI, string Dist); + ~debReleaseIndex(); virtual string ArchiveURI(string File) const {return URI + File;}; virtual bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const; diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index ace4e00b5..2f87c767b 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -152,3 +152,11 @@ bool debSrcRecordParser::Files(vector &List) return true; } /*}}}*/ +// SrcRecordParser::~SrcRecordParser - Destructor /*{{{*/ +// --------------------------------------------------------------------- +/* */ +debSrcRecordParser::~debSrcRecordParser() +{ + delete[] Buffer; +} + /*}}}*/ diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h index 8b1237ccd..a3b5a8286 100644 --- a/apt-pkg/deb/debsrcrecords.h +++ b/apt-pkg/deb/debsrcrecords.h @@ -50,6 +50,7 @@ class debSrcRecordParser : public pkgSrcRecords::Parser debSrcRecordParser(string File,pkgIndexFile const *Index) : Parser(Index), Fd(File,FileFd::ReadOnly), Tags(&Fd,102400), Buffer(0), BufSize(0) {} + ~debSrcRecordParser(); }; #endif diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 2b87d7da9..779b6ab14 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -39,7 +39,13 @@ class metaIndex virtual vector *GetIndexFiles() = 0; virtual bool IsTrusted() const = 0; - virtual ~metaIndex() {}; + virtual ~metaIndex() { + if (Indexes == 0) + return; + for (vector::iterator I = (*Indexes).begin(); I != (*Indexes).end(); ++I) + delete *I; + delete Indexes; + } }; #endif diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 93b3a83dc..f5642c04d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -111,6 +111,9 @@ class CacheFile : public pkgCacheFile return Open(true); } CacheFile() : List(0) {}; + ~CacheFile() { + delete[] List; + } }; /*}}}*/ diff --git a/debian/control b/debian/control index ba9e32e4b..8f5d6ff75 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Eugene V. Lyubimkin -Standards-Version: 3.8.0 +Standards-Version: 3.8.1.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ diff --git a/po/apt-all.pot b/po/apt-all.pot index a1d7cb99d..d1b705837 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-29 17:01+0200\n" +"POT-Creation-Date: 2009-06-30 14:09+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -156,7 +156,7 @@ msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -550,221 +550,221 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr "" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:681 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:688 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:710 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:714 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:721 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:723 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:785 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:796 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:837 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:845 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:853 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:892 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -772,74 +772,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:915 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1388 +#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1005 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1012 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1016 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1021 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1022 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1056 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1107 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1117 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -847,68 +847,68 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1136 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1139 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1159 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1204 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1307 +#: cmdline/apt-get.cc:1310 #, c-format msgid "No source package '%s' picking '%s' instead\n" msgstr "" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1348 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1361 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1413 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1445 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1452 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -924,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1459 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1478 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1671 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1702 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1715 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1718 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1730 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -974,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1748 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1777 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1866 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1867 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1896 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1904 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2079 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2186 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2232 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2260 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2273 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2290 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2309 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2325 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2353 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2373 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2425 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2478 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2541 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2555 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2559 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2591 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2628 +#: cmdline/apt-get.cc:2632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1163,7 +1163,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2795 +#: cmdline/apt-get.cc:2799 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1927,7 +1927,7 @@ msgstr "" msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1029 #, c-format msgid "Selection %s not found" msgstr "" @@ -2197,28 +2197,28 @@ msgstr "" msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:160 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:181 apt-pkg/depcache.cc:200 apt-pkg/depcache.cc:204 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:228 +#: apt-pkg/depcache.cc:221 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:234 +#: apt-pkg/depcache.cc:227 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2302,17 +2302,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1135 +#: apt-pkg/algorithms.cc:1147 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1137 +#: apt-pkg/algorithms.cc:1149 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1414 apt-pkg/algorithms.cc:1416 +#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -- cgit v1.2.3-70-g09d2 From 4b65cc13c74231e14a313ea05a2376cbc5155c5f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 30 Jun 2009 14:16:32 +0200 Subject: fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work correctly when downloading from multiple sites (Closes: #534752) --- apt-pkg/acquire.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 38944bbac..daea234d3 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -265,7 +265,7 @@ pkgAcquire::MethodConfig *pkgAcquire::GetConfig(string Access) return 0; /* if a method uses DownloadLimit, we switch to SingleInstance mode */ - if(_config->FindI("Acquire::"+Access+"::DlLimit",0) > 0) + if(_config->FindI("Acquire::"+Access+"::Dl-Limit",0) > 0) Conf->SingleInstance = true; return Conf; diff --git a/debian/changelog b/debian/changelog index 333640b18..fd37b9c71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ apt (0.7.22) UNRELEASED; urgency=low * do not write state file in simulate mode (closes: #433007) * add hook for auto-install (closes: #470035) * support IsAutoInstallOk in the resolver too + * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work + correctly when downloading from multiple sites (Closes: #534752) [ Michael Vogt ] * honor the dpkg hold state in AutoInstOk (closes: #64141) -- cgit v1.2.3-70-g09d2 From 92fcbfc16396d9a2fbde0edb0902d4ebe7ff0090 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 30 Jun 2009 21:37:30 +0200 Subject: add the various foldmarkers in apt-pkg & cmdline (no code change) --- apt-pkg/acquire-item.cc | 102 +++++------- apt-pkg/acquire-item.h | 44 ++--- apt-pkg/acquire-method.cc | 2 - apt-pkg/acquire.cc | 5 +- apt-pkg/acquire.h | 24 +-- apt-pkg/algorithms.cc | 3 - apt-pkg/algorithms.h | 8 +- apt-pkg/cachefile.cc | 3 - apt-pkg/cacheiterators.h | 36 ++--- apt-pkg/cdrom.cc | 18 +-- apt-pkg/cdrom.h | 9 +- apt-pkg/clean.cc | 1 - apt-pkg/contrib/hashes.cc | 11 +- apt-pkg/contrib/sha256.cc | 32 ++-- apt-pkg/depcache.cc | 54 +++---- apt-pkg/indexcopy.cc | 16 +- apt-pkg/indexcopy.h | 22 ++- apt-pkg/indexfile.cc | 1 - apt-pkg/indexrecords.cc | 14 +- apt-pkg/orderlist.cc | 10 +- apt-pkg/packagemanager.cc | 4 +- apt-pkg/pkgcache.h | 48 +++--- apt-pkg/pkgcachegen.cc | 1 - apt-pkg/pkgcachegen.h | 8 +- apt-pkg/pkgrecords.h | 8 +- apt-pkg/vendorlist.cc | 19 +-- cmdline/apt-cache.cc | 19 +-- cmdline/apt-cdrom.cc | 10 +- cmdline/apt-config.cc | 4 +- cmdline/apt-extracttemplates.cc | 4 +- cmdline/apt-get.cc | 18 +-- cmdline/apt-sortpkgs.cc | 8 +- debian/changelog | 1 + po/apt-all.pot | 348 ++++++++++++++++++++-------------------- 34 files changed, 420 insertions(+), 495 deletions(-) (limited to 'debian') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 09ea5da02..39ae327cb 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -131,9 +131,7 @@ void pkgAcquire::Item::Rename(string From,string To) } } /*}}}*/ - - -// AcqDiffIndex::AcqDiffIndex - Constructor +// AcqDiffIndex::AcqDiffIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the @@ -184,7 +182,7 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, QueueURI(Desc); } - + /*}}}*/ // AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- /* The only header we use is the last-modified header. */ @@ -202,9 +200,8 @@ string pkgAcqDiffIndex::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } - - -bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) + /*}}}*/ +bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) /*{{{*/ { if(Debug) std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile @@ -291,8 +288,8 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) std::clog << "Can't find a patch in the index file" << std::endl; return false; } - -void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) + /*}}}*/ +void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ { if(Debug) std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl @@ -305,8 +302,8 @@ void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Status = StatDone; Dequeue(); } - -void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, + /*}}}*/ +void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, /*{{{*/ pkgAcquire::MethodConfig *Cnf) { if(Debug) @@ -335,10 +332,8 @@ void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash, Dequeue(); return; } - - - -// AcqIndexDiffs::AcqIndexDiffs - Constructor + /*}}}*/ +// AcqIndexDiffs::AcqIndexDiffs - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The package diff is added to the queue. one object is constructed * for each diff and the index @@ -372,9 +367,8 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, QueueNextDiff(); } } - - -void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) + /*}}}*/ +void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ { if(Debug) std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl @@ -383,9 +377,8 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) ExpectedHash); Finish(); } - - -// helper that cleans the item out of the fetcher queue + /*}}}*/ +// Finish - helper that cleans the item out of the fetcher queue /*{{{*/ void pkgAcqIndexDiffs::Finish(bool allDone) { // we restore the original name, this is required, otherwise @@ -420,10 +413,8 @@ void pkgAcqIndexDiffs::Finish(bool allDone) Dequeue(); return; } - - - -bool pkgAcqIndexDiffs::QueueNextDiff() + /*}}}*/ +bool pkgAcqIndexDiffs::QueueNextDiff() /*{{{*/ { // calc sha1 of the just patched file @@ -469,10 +460,8 @@ bool pkgAcqIndexDiffs::QueueNextDiff() return true; } - - - -void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, + /*}}}*/ +void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, /*{{{*/ pkgAcquire::MethodConfig *Cnf) { if(Debug) @@ -543,8 +532,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, return Finish(true); } } - - + /*}}}*/ // AcqIndex::AcqIndex - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The package file is added to the queue and a second class is @@ -594,8 +582,7 @@ string pkgAcqIndex::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } /*}}}*/ - -void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ { bool descChanged = false; // no .bz2 found, retry with .gz @@ -630,8 +617,7 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Item::Failed(Message,Cnf); } - - + /*}}}*/ // AcqIndex::Done - Finished a fetch /*{{{*/ // --------------------------------------------------------------------- /* This goes through a number of states.. On the initial fetch the @@ -735,7 +721,7 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, QueueURI(Desc); Mode = decompProg; } - + /*}}}*/ // AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The Translation file is added to the queue */ @@ -744,7 +730,6 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner, : pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, HashString(), "") { } - /*}}}*/ // AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/ // --------------------------------------------------------------------- @@ -764,8 +749,7 @@ void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Item::Failed(Message,Cnf); } /*}}}*/ - -pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, +pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner, /*{{{*/ string URI,string URIDesc,string ShortDesc, string MetaIndexURI, string MetaIndexURIDesc, string MetaIndexShortDesc, @@ -854,7 +838,7 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5, } /*}}}*/ -void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) +void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)/*{{{*/ { string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI); @@ -890,8 +874,8 @@ void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf) Item::Failed(Message,Cnf); } - -pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, + /*}}}*/ +pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, /*{{{*/ string URI,string URIDesc,string ShortDesc, string SigFile, const vector* IndexTargets, @@ -910,7 +894,6 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner, QueueURI(Desc); } - /*}}}*/ // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- @@ -926,8 +909,8 @@ string pkgAcqMetaIndex::Custom600Headers() return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime); } - -void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, + /*}}}*/ +void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, /*{{{*/ pkgAcquire::MethodConfig *Cfg) { Item::Done(Message,Size,Hash,Cfg); @@ -968,8 +951,8 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long Size,string Hash, } } } - -void pkgAcqMetaIndex::RetrievalDone(string Message) + /*}}}*/ +void pkgAcqMetaIndex::RetrievalDone(string Message) /*{{{*/ { // We have just finished downloading a Release file (it is not // verified yet) @@ -1007,8 +990,8 @@ void pkgAcqMetaIndex::RetrievalDone(string Message) chmod(FinalFile.c_str(),0644); DestFile = FinalFile; } - -void pkgAcqMetaIndex::AuthDone(string Message) + /*}}}*/ +void pkgAcqMetaIndex::AuthDone(string Message) /*{{{*/ { // At this point, the gpgv method has succeeded, so there is a // valid signature from a key in the trusted keyring. We @@ -1041,8 +1024,8 @@ void pkgAcqMetaIndex::AuthDone(string Message) Rename(SigFile,VerifiedSigFile); chmod(VerifiedSigFile.c_str(),0644); } - -void pkgAcqMetaIndex::QueueIndexes(bool verify) + /*}}}*/ +void pkgAcqMetaIndex::QueueIndexes(bool verify) /*{{{*/ { for (vector ::const_iterator Target = IndexTargets->begin(); Target != IndexTargets->end(); @@ -1084,8 +1067,8 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) (*Target)->ShortDesc, ExpectedIndexHash); } } - -bool pkgAcqMetaIndex::VerifyVendor(string Message) + /*}}}*/ +bool pkgAcqMetaIndex::VerifyVendor(string Message) /*{{{*/ { // // Maybe this should be made available from above so we don't have // // to read and parse it every time? @@ -1171,9 +1154,8 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message) return true; } - /*}}}*/ -// pkgAcqMetaIndex::Failed - no Release file present or no signature -// file present /*{{{*/ + /*}}}*/ +// pkgAcqMetaIndex::Failed - no Release file present or no signature file present /*{{{*/ // --------------------------------------------------------------------- /* */ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) @@ -1210,9 +1192,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) // back to queueing Packages files without verification QueueIndexes(false); } - /*}}}*/ - // AcqArchive::AcqArchive - Constructor /*{{{*/ // --------------------------------------------------------------------- /* This just sets up the initial fetch environment and queues the first @@ -1495,14 +1475,13 @@ void pkgAcqArchive::Failed(string Message,pkgAcquire::MethodConfig *Cnf) } } /*}}}*/ -// AcqArchive::IsTrusted - Determine whether this archive comes from a -// trusted source /*{{{*/ +// AcqArchive::IsTrusted - Determine whether this archive comes from a trusted source /*{{{*/ // --------------------------------------------------------------------- bool pkgAcqArchive::IsTrusted() { return Trusted; } - + /*}}}*/ // AcqArchive::Finished - Fetching has finished, tidy up /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1514,7 +1493,6 @@ void pkgAcqArchive::Finished() StoreFilename = string(); } /*}}}*/ - // AcqFile::pkgAcqFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* The file is added to the queue */ diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index a48f7f7e5..36a926a0f 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -34,7 +34,7 @@ * \file acquire-item.h */ -/** \brief Represents the process by which a pkgAcquire object should +/** \brief Represents the process by which a pkgAcquire object should {{{ * retrieve a file or a collection of files. * * By convention, Item subclasses should insert themselves into the @@ -261,8 +261,8 @@ class pkgAcquire::Item */ virtual ~Item(); }; - -/** \brief Information about an index patch (aka diff). */ + /*}}}*/ +/** \brief Information about an index patch (aka diff). */ /*{{{*/ struct DiffInfo { /** The filename of the diff. */ string file; @@ -273,8 +273,8 @@ struct DiffInfo { /** The size of the diff. */ unsigned long size; }; - -/** \brief An item that is responsible for fetching an index file of + /*}}}*/ +/** \brief An item that is responsible for fetching an index file of {{{ * package list diffs and starting the package list's download. * * This item downloads the Index file and parses it, then enqueues @@ -348,8 +348,8 @@ class pkgAcqDiffIndex : public pkgAcquire::Item pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, HashString ExpectedHash); }; - -/** \brief An item that is responsible for fetching all the patches + /*}}}*/ +/** \brief An item that is responsible for fetching all the patches {{{ * that need to be applied to a given package index file. * * After downloading and applying a single patch, this item will @@ -477,8 +477,8 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item string ShortDesc, HashString ExpectedHash, vector diffs=vector()); }; - -/** \brief An acquire item that is responsible for fetching an index + /*}}}*/ +/** \brief An acquire item that is responsible for fetching an index {{{ * file (e.g., Packages or Sources). * * \sa pkgAcqDiffIndex, pkgAcqIndexDiffs, pkgAcqIndexTrans @@ -545,8 +545,8 @@ class pkgAcqIndex : public pkgAcquire::Item pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, HashString ExpectedHash, string compressExt=""); }; - -/** \brief An acquire item that is responsible for fetching a + /*}}}*/ +/** \brief An acquire item that is responsible for fetching a {{{ * translated index file. * * The only difference from pkgAcqIndex is that transient failures @@ -579,8 +579,8 @@ class pkgAcqIndexTrans : public pkgAcqIndex pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc); }; - -/** \brief Information about an index file. */ + /*}}}*/ +/** \brief Information about an index file. */ /*{{{*/ struct IndexTarget { /** \brief A URI from which the index file can be downloaded. */ @@ -597,8 +597,8 @@ struct IndexTarget */ string MetaKey; }; - -/** \brief An acquire item that downloads the detached signature + /*}}}*/ +/** \brief An acquire item that downloads the detached signature {{{ * of a meta-index (Release) file, then queues up the release * file itself. * @@ -660,8 +660,8 @@ class pkgAcqMetaSig : public pkgAcquire::Item const vector* IndexTargets, indexRecords* MetaIndexParser); }; - -/** \brief An item that is responsible for downloading the meta-index + /*}}}*/ +/** \brief An item that is responsible for downloading the meta-index {{{ * file (i.e., Release) itself and verifying its signature. * * Once the download and verification are complete, the downloads of @@ -756,8 +756,8 @@ class pkgAcqMetaIndex : public pkgAcquire::Item const vector* IndexTargets, indexRecords* MetaIndexParser); }; - -/** \brief An item that is responsible for fetching a package file. + /*}}}*/ +/** \brief An item that is responsible for fetching a package file. {{{ * * If the package file already exists in the cache, nothing will be * done. @@ -840,8 +840,8 @@ class pkgAcqArchive : public pkgAcquire::Item pkgRecords *Recs,pkgCache::VerIterator const &Version, string &StoreFilename); }; - -/** \brief Retrieve an arbitrary file to the current directory. + /*}}}*/ +/** \brief Retrieve an arbitrary file to the current directory. {{{ * * The file is retrieved even if it is accessed via a URL type that * normally is a NOP, such as "file". If the download fails, the @@ -902,7 +902,7 @@ class pkgAcqFile : public pkgAcquire::Item string Desc, string ShortDesc, const string &DestDir="", const string &DestFilename=""); }; - + /*}}}*/ /** @} */ #endif diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index acf1156dc..fe066741c 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -446,7 +446,6 @@ void pkgAcqMethod::Status(const char *Format,...) exit(100); } /*}}}*/ - // AcqMethod::Redirect - Send a redirect message /*{{{*/ // --------------------------------------------------------------------- /* This method sends the redirect message and also manipulates the queue @@ -478,7 +477,6 @@ void pkgAcqMethod::Redirect(const string &NewURI) QueueBack = I->Next; } /*}}}*/ - // AcqMethod::FetchResult::FetchResult - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index daea234d3..68ff393d0 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -484,7 +484,7 @@ double pkgAcquire::PartialPresent() Total += (*I)->PartialSize; return Total; } - + /*}}}*/ // Acquire::UriBegin - Start iterator for the uri list /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -501,7 +501,6 @@ pkgAcquire::UriIterator pkgAcquire::UriEnd() return UriIterator(0); } /*}}}*/ - // Acquire::MethodConfig::MethodConfig - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -515,7 +514,6 @@ pkgAcquire::MethodConfig::MethodConfig() Next = 0; } /*}}}*/ - // Queue::Queue - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -727,7 +725,6 @@ void pkgAcquire::Queue::Bump() Cycle(); } /*}}}*/ - // AcquireStatus::pkgAcquireStatus - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h index eaadded55..6c130c1b3 100644 --- a/apt-pkg/acquire.h +++ b/apt-pkg/acquire.h @@ -30,7 +30,7 @@ ##################################################################### */ /*}}}*/ -/** \defgroup acquire Acquire system +/** \defgroup acquire Acquire system {{{ * * \brief The Acquire system is responsible for retrieving files from * local or remote URIs and postprocessing them (for instance, @@ -54,7 +54,7 @@ * once, but it is not clear what its behavior in this case is, and * no subclass of pkgAcquire::Item seems to actually use this * capability. - */ + */ /*}}}*/ /** \addtogroup acquire * @@ -78,7 +78,7 @@ using std::string; class pkgAcquireStatus; -/** \brief The core download scheduler. +/** \brief The core download scheduler. {{{ * * This class represents an ongoing download. It manages the lists * of active and pending downloads and handles setting up and tearing @@ -366,8 +366,8 @@ struct pkgAcquire::ItemDesc /** brief The underlying item which is to be downloaded. */ Item *Owner; }; - -/** \brief A single download queue in a pkgAcquire object. + /*}}}*/ +/** \brief A single download queue in a pkgAcquire object. {{{ * * \todo Why so many protected values? */ @@ -528,8 +528,8 @@ class pkgAcquire::Queue */ ~Queue(); }; - -/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. */ + /*}}}*/ +/** \brief Iterates over all the URIs being fetched by a pkgAcquire object. {{{*/ class pkgAcquire::UriIterator { /** The next queue to iterate over. */ @@ -568,8 +568,8 @@ class pkgAcquire::UriIterator } } }; - -/** \brief Information about the properties of a single acquire method. */ + /*}}}*/ +/** \brief Information about the properties of a single acquire method. {{{*/ struct pkgAcquire::MethodConfig { /** \brief The next link on the acquire method list. @@ -621,8 +621,8 @@ struct pkgAcquire::MethodConfig */ MethodConfig(); }; - -/** \brief A monitor object for downloads controlled by the pkgAcquire class. + /*}}}*/ +/** \brief A monitor object for downloads controlled by the pkgAcquire class. {{{ * * \todo Why protected members? * @@ -762,7 +762,7 @@ class pkgAcquireStatus pkgAcquireStatus(); virtual ~pkgAcquireStatus() {}; }; - + /*}}}*/ /** @} */ #endif diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 2ad064319..68a4af8ed 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -442,7 +442,6 @@ bool pkgMinimizeUpgrade(pkgDepCache &Cache) return true; } /*}}}*/ - // ProblemResolver::pkgProblemResolver - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1323,7 +1322,6 @@ void pkgProblemResolver::InstallProtect() } } /*}}}*/ - // PrioSortList - Sort a list of versions by priority /*{{{*/ // --------------------------------------------------------------------- /* This is ment to be used in conjunction with AllTargets to get a list @@ -1354,7 +1352,6 @@ void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List) qsort(List,Count,sizeof(*List),PrioComp); } /*}}}*/ - // CacheFile::ListUpdate - update the cache files /*{{{*/ // --------------------------------------------------------------------- /* This is a simple wrapper to update the cache. it will fetch stuff diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h index d183cd213..cee30b679 100644 --- a/apt-pkg/algorithms.h +++ b/apt-pkg/algorithms.h @@ -39,7 +39,7 @@ using std::ostream; -class pkgSimulate : public pkgPackageManager +class pkgSimulate : public pkgPackageManager /*{{{*/ { protected: @@ -75,8 +75,8 @@ private: pkgSimulate(pkgDepCache *Cache); }; - -class pkgProblemResolver + /*}}}*/ +class pkgProblemResolver /*{{{*/ { pkgDepCache &Cache; typedef pkgCache::PkgIterator PkgIterator; @@ -124,7 +124,7 @@ class pkgProblemResolver pkgProblemResolver(pkgDepCache *Cache); ~pkgProblemResolver(); }; - + /*}}}*/ bool pkgDistUpgrade(pkgDepCache &Cache); bool pkgApplyStatus(pkgDepCache &Cache); bool pkgFixBroken(pkgDepCache &Cache); diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 1a84aea54..f287a244c 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -24,7 +24,6 @@ #include /*}}}*/ - // CacheFile::CacheFile - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -108,8 +107,6 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) return true; } /*}}}*/ - - // CacheFile::Close - close the cache files /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h index cf79b3a6b..3d35e4298 100644 --- a/apt-pkg/cacheiterators.h +++ b/apt-pkg/cacheiterators.h @@ -32,7 +32,7 @@ #define PKGLIB_CACHEITERATORS_H -// Package Iterator +// Package Iterator /*{{{*/ class pkgCache::PkgIterator { friend class pkgCache; @@ -96,8 +96,8 @@ class pkgCache::PkgIterator }; inline PkgIterator() : Pkg(0), Owner(0), HashIndex(0) {}; }; - -// Version Iterator + /*}}}*/ +// Version Iterator /*{{{*/ class pkgCache::VerIterator { Version *Ver; @@ -155,8 +155,8 @@ class pkgCache::VerIterator Ver = Owner.VerP; }; }; - -// Description Iterator + /*}}}*/ +// Description Iterator /*{{{*/ class pkgCache::DescIterator { Description *Desc; @@ -199,8 +199,8 @@ class pkgCache::DescIterator Desc = Owner.DescP; }; }; - -// Dependency iterator + /*}}}*/ +// Dependency iterator /*{{{*/ class pkgCache::DepIterator { Dependency *Dep; @@ -258,8 +258,8 @@ class pkgCache::DepIterator }; inline DepIterator() : Dep(0), Type(DepVer), Owner(0) {}; }; - -// Provides iterator + /*}}}*/ +// Provides iterator /*{{{*/ class pkgCache::PrvIterator { Provides *Prv; @@ -311,8 +311,8 @@ class pkgCache::PrvIterator Prv = Owner.ProvideP; }; }; - -// Package file + /*}}}*/ +// Package file /*{{{*/ class pkgCache::PkgFileIterator { pkgCache *Owner; @@ -358,8 +358,8 @@ class pkgCache::PkgFileIterator inline PkgFileIterator(pkgCache &Owner) : Owner(&Owner), File(Owner.PkgFileP) {}; inline PkgFileIterator(pkgCache &Owner,PackageFile *Trg) : Owner(&Owner), File(Trg) {}; }; - -// Version File + /*}}}*/ +// Version File /*{{{*/ class pkgCache::VerFileIterator { pkgCache *Owner; @@ -390,8 +390,8 @@ class pkgCache::VerFileIterator inline VerFileIterator() : Owner(0), FileP(0) {}; inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {}; }; - -// Description File + /*}}}*/ +// Description File /*{{{*/ class pkgCache::DescFileIterator { pkgCache *Owner; @@ -422,8 +422,8 @@ class pkgCache::DescFileIterator inline DescFileIterator() : Owner(0), FileP(0) {}; inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {}; }; - -// Inlined Begin functions cant be in the class because of order problems + /*}}}*/ +// Inlined Begin functions cant be in the class because of order problems /*{{{*/ inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const {return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);}; inline pkgCache::VerIterator pkgCache::PkgIterator::CurrentVer() const @@ -442,5 +442,5 @@ inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const {return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);}; inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);}; - + /*}}}*/ #endif diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 370687f24..891c59836 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -160,7 +160,7 @@ bool pkgCdrom::FindPackages(string CD, return !_error->PendingError(); } - + /*}}}*/ // Score - We compute a 'score' for a path /*{{{*/ // --------------------------------------------------------------------- /* Paths are scored based on how close they come to what I consider @@ -210,7 +210,6 @@ int pkgCdrom::Score(string Path) return Res; } - /*}}}*/ // DropBinaryArch - Dump dirs with a string like /binary-/ /*{{{*/ // --------------------------------------------------------------------- @@ -248,8 +247,7 @@ bool pkgCdrom::DropBinaryArch(vector &List) return true; } - - + /*}}}*/ // DropRepeats - Drop repeated files resulting from symlinks /*{{{*/ // --------------------------------------------------------------------- /* Here we go and stat every file that we found and strip dup inodes. */ @@ -304,7 +302,6 @@ bool pkgCdrom::DropRepeats(vector &List,const char *Name) return true; } /*}}}*/ - // ReduceSourceList - Takes the path list and reduces it /*{{{*/ // --------------------------------------------------------------------- /* This takes the list of source list expressed entires and collects @@ -513,9 +510,8 @@ bool pkgCdrom::WriteSourceList(string Name,vector &List,bool Source) return true; } - - -bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) + /*}}}*/ +bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) /*{{{*/ { stringstream msg; @@ -573,9 +569,8 @@ bool pkgCdrom::Ident(string &ident, pkgCdromStatus *log) return true; } - - -bool pkgCdrom::Add(pkgCdromStatus *log) + /*}}}*/ +bool pkgCdrom::Add(pkgCdromStatus *log) /*{{{*/ { stringstream msg; @@ -844,3 +839,4 @@ bool pkgCdrom::Add(pkgCdromStatus *log) return true; } + /*}}}*/ diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 68d61c098..608cb0e2f 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -8,7 +8,7 @@ using namespace std; -class pkgCdromStatus +class pkgCdromStatus /*{{{*/ { protected: int totalSteps; @@ -29,8 +29,8 @@ class pkgCdromStatus // Progress indicator for the Index rewriter virtual OpProgress* GetOpProgress() {return NULL; }; }; - -class pkgCdrom + /*}}}*/ +class pkgCdrom /*{{{*/ { protected: enum { @@ -65,7 +65,6 @@ class pkgCdrom bool Ident(string &ident, pkgCdromStatus *log); bool Add(pkgCdromStatus *log); }; - - + /*}}}*/ #endif diff --git a/apt-pkg/clean.cc b/apt-pkg/clean.cc index 3fa67e8e6..0d1dfbf74 100644 --- a/apt-pkg/clean.cc +++ b/apt-pkg/clean.cc @@ -19,7 +19,6 @@ #include #include /*}}}*/ - // ArchiveCleaner::Go - Perform smart cleanup of the archive /*{{{*/ // --------------------------------------------------------------------- /* Scan the directory for files to erase, we check the version information diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index fcc2f887c..52b9bfbe6 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -34,7 +34,7 @@ HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash) { } -HashString::HashString(string StringedHash) +HashString::HashString(string StringedHash) /*{{{*/ { // legacy: md5sum without "MD5Sum:" prefix if (StringedHash.find(":") == string::npos && StringedHash.size() == 32) @@ -50,9 +50,8 @@ HashString::HashString(string StringedHash) if(_config->FindB("Debug::Hashes",false) == true) std::clog << "HashString(string): " << Type << " : " << Hash << std::endl; } - - -bool HashString::VerifyFile(string filename) const + /*}}}*/ +bool HashString::VerifyFile(string filename) const /*{{{*/ { FileFd fd; MD5Summation MD5; @@ -83,7 +82,7 @@ bool HashString::VerifyFile(string filename) const return (fileHash == Hash); } - + /*}}}*/ const char** HashString::SupportedHashes() { return _SupportedHashes; @@ -94,13 +93,11 @@ bool HashString::empty() const return (Type.empty() || Hash.empty()); } - string HashString::toStr() const { return Type+string(":")+Hash; } - // Hashes::AddFD - Add the contents of the FD /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc index ecda3d8e8..e380c13ae 100644 --- a/apt-pkg/contrib/sha256.cc +++ b/apt-pkg/contrib/sha256.cc @@ -1,5 +1,5 @@ /* - * Cryptographic API. + * Cryptographic API. {{{ * * SHA-256, as specified in * http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf @@ -17,7 +17,7 @@ * Software Foundation; either version 2 of the License, or (at your option) * any later version. * - */ + */ /*}}}*/ #ifdef __GNUG__ #pragma implementation "apt-pkg/sha256.h" @@ -65,20 +65,20 @@ static inline u32 Maj(u32 x, u32 y, u32 z) #define H6 0x1f83d9ab #define H7 0x5be0cd19 -static inline void LOAD_OP(int I, u32 *W, const u8 *input) +static inline void LOAD_OP(int I, u32 *W, const u8 *input) /*{{{*/ { W[I] = ( ((u32) input[I * 4 + 0] << 24) | ((u32) input[I * 4 + 1] << 16) | ((u32) input[I * 4 + 2] << 8) | ((u32) input[I * 4 + 3])); } - + /*}}}*/ static inline void BLEND_OP(int I, u32 *W) { W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16]; } -static void sha256_transform(u32 *state, const u8 *input) +static void sha256_transform(u32 *state, const u8 *input) /*{{{*/ { u32 a, b, c, d, e, f, g, h, t1, t2; u32 W[64]; @@ -240,8 +240,8 @@ static void sha256_transform(u32 *state, const u8 *input) a = b = c = d = e = f = g = h = t1 = t2 = 0; memset(W, 0, 64 * sizeof(u32)); } - -SHA256Summation::SHA256Summation() + /*}}}*/ +SHA256Summation::SHA256Summation() /*{{{*/ { Sum.state[0] = H0; Sum.state[1] = H1; @@ -255,8 +255,8 @@ SHA256Summation::SHA256Summation() memset(Sum.buf, 0, sizeof(Sum.buf)); Done = false; } - -bool SHA256Summation::Add(const u8 *data, unsigned long len) + /*}}}*/ +bool SHA256Summation::Add(const u8 *data, unsigned long len) /*{{{*/ { struct sha256_ctx *sctx = ∑ unsigned int i, index, part_len; @@ -291,8 +291,8 @@ bool SHA256Summation::Add(const u8 *data, unsigned long len) return true; } - -SHA256SumValue SHA256Summation::Result() + /*}}}*/ +SHA256SumValue SHA256Summation::Result() /*{{{*/ { struct sha256_ctx *sctx = ∑ if (!Done) { @@ -340,7 +340,7 @@ SHA256SumValue SHA256Summation::Result() return res; } - + /*}}}*/ // SHA256SumValue::SHA256SumValue - Constructs the sum from a string /*{{{*/ // --------------------------------------------------------------------- /* The string form of a SHA256 is a 64 character hex number */ @@ -349,7 +349,6 @@ SHA256SumValue::SHA256SumValue(string Str) memset(Sum,0,sizeof(Sum)); Set(Str); } - /*}}}*/ // SHA256SumValue::SHA256SumValue - Default constructor /*{{{*/ // --------------------------------------------------------------------- @@ -358,7 +357,6 @@ SHA256SumValue::SHA256SumValue() { memset(Sum,0,sizeof(Sum)); } - /*}}}*/ // SHA256SumValue::Set - Set the sum from a string /*{{{*/ // --------------------------------------------------------------------- @@ -391,9 +389,7 @@ string SHA256SumValue::Value() const return string(Result); } - - - + /*}}}*/ // SHA256SumValue::operator == - Comparator /*{{{*/ // --------------------------------------------------------------------- /* Call memcmp on the buffer */ @@ -402,8 +398,6 @@ bool SHA256SumValue::operator == (const SHA256SumValue & rhs) const return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0; } /*}}}*/ - - // SHA256Summation::AddFD - Add content of file into the checksum /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index b1b8f970f..a284a05c7 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -27,8 +27,8 @@ #include #include - -// helper for Install-Recommends-Sections and Never-MarkAuto-Sections + /*}}}*/ +// helper for Install-Recommends-Sections and Never-MarkAuto-Sections /*{{{*/ static bool ConfigValueInSubTree(const char* SubTree, const char *needle) { @@ -47,8 +47,8 @@ ConfigValueInSubTree(const char* SubTree, const char *needle) } return false; } - -pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : + /*}}}*/ +pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) : /*{{{*/ cache(cache), released(false) { ++cache.group_level; @@ -76,7 +76,7 @@ pkgDepCache::ActionGroup::~ActionGroup() { release(); } - + /*}}}*/ // DepCache::pkgDepCache - Constructors /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -161,8 +161,7 @@ bool pkgDepCache::Init(OpProgress *Prog) return true; } /*}}}*/ - -bool pkgDepCache::readStateFile(OpProgress *Prog) +bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ { FileFd state_file; string state = _config->FindDir("Dir::State") + "extended_states"; @@ -200,8 +199,8 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) return true; } - -bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) + /*}}}*/ +bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ { if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "pkgDepCache::writeStateFile()" << std::endl; @@ -283,7 +282,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) return true; } - + /*}}}*/ // DepCache::CheckDep - Checks a single dependency /*{{{*/ // --------------------------------------------------------------------- /* This first checks the dependency against the main target package and @@ -701,9 +700,7 @@ void pkgDepCache::Update(PkgIterator const &Pkg) P.end() != true; P++) Update(P.ParentPkg().RevDependsList()); } - /*}}}*/ - // DepCache::MarkKeep - Put the package in the keep state /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1056,7 +1053,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } } - + /*}}}*/ // DepCache::AutoInstOk - check if it is to install this package /*{{{*/ // --------------------------------------------------------------------- /* The default implementation just honors dpkg hold @@ -1168,7 +1165,6 @@ const char *pkgDepCache::StateCache::StripEpoch(const char *Ver) return Ver; } /*}}}*/ - // Policy::GetCandidateVer - Returns the Candidate install version /*{{{*/ // --------------------------------------------------------------------- /* The default just returns the highest available version that is not @@ -1205,7 +1201,6 @@ pkgCache::VerIterator pkgDepCache::Policy::GetCandidateVer(PkgIterator Pkg) return Last; } /*}}}*/ - // Policy::IsImportantDep - True if the dependency is important /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1231,8 +1226,7 @@ bool pkgDepCache::Policy::IsImportantDep(DepIterator Dep) return false; } /*}}}*/ - -pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() +pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() /*{{{*/ : constructedSuccessfully(false) { Configuration::Item const *Opts; @@ -1261,8 +1255,8 @@ pkgDepCache::DefaultRootSetFunc::DefaultRootSetFunc() constructedSuccessfully = true; } - -pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() + /*}}}*/ +pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() /*{{{*/ { for(unsigned int i = 0; i < rootSetRegexp.size(); i++) { @@ -1270,9 +1264,8 @@ pkgDepCache::DefaultRootSetFunc::~DefaultRootSetFunc() delete rootSetRegexp[i]; } } - - -bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg) + /*}}}*/ +bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg) /*{{{*/ { for(unsigned int i = 0; i < rootSetRegexp.size(); i++) if (regexec(rootSetRegexp[i], pkg.Name(), 0, 0, 0) == 0) @@ -1280,8 +1273,8 @@ bool pkgDepCache::DefaultRootSetFunc::InRootSet(const pkgCache::PkgIterator &pkg return false; } - -pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() + /*}}}*/ +pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() /*{{{*/ { DefaultRootSetFunc *f = new DefaultRootSetFunc; if(f->wasConstructedSuccessfully()) @@ -1292,7 +1285,7 @@ pkgDepCache::InRootSetFunc *pkgDepCache::GetRootSetFunc() return NULL; } } - + /*}}}*/ bool pkgDepCache::MarkFollowsRecommends() { return _config->FindB("APT::AutoRemove::RecommendsImportant", true); @@ -1303,7 +1296,7 @@ bool pkgDepCache::MarkFollowsSuggests() return _config->FindB("APT::AutoRemove::SuggestsImportant", false); } -// the main mark algorithm +// pkgDepCache::MarkRequired - the main mark algorithm /*{{{*/ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) { bool follow_recommends; @@ -1348,8 +1341,8 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) return true; } - -// mark a single package in Mark-and-Sweep + /*}}}*/ +// MarkPackage - mark a single package in Mark-and-Sweep /*{{{*/ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, const pkgCache::VerIterator &ver, bool follow_recommends, @@ -1468,8 +1461,8 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, } } } - -bool pkgDepCache::Sweep() + /*}}}*/ +bool pkgDepCache::Sweep() /*{{{*/ { // do the sweep for(PkgIterator p=PkgBegin(); !p.end(); ++p) @@ -1492,3 +1485,4 @@ bool pkgDepCache::Sweep() return true; } + /*}}}*/ diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 9e5c03e0b..22ee29697 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -542,8 +542,8 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) return true; } - -bool SigVerify::CopyMetaIndex(string CDROM, string CDName, + /*}}}*/ +bool SigVerify::CopyMetaIndex(string CDROM, string CDName, /*{{{*/ string prefix, string file) { char S[400]; @@ -563,8 +563,8 @@ bool SigVerify::CopyMetaIndex(string CDROM, string CDName, return true; } - -bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, + /*}}}*/ +bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, /*{{{*/ vector PkgList,vector SrcList) { if (SigList.size() == 0) @@ -665,10 +665,9 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, return true; } - - -bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector &List, - pkgCdromStatus *log) + /*}}}*/ +bool TranslationsCopy::CopyTranslations(string CDROM,string Name, /*{{{*/ + vector &List, pkgCdromStatus *log) { OpProgress *Progress = NULL; if (List.size() == 0) @@ -840,3 +839,4 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector return true; } + /*}}}*/ diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h index 7778ae595..9e5ad4e43 100644 --- a/apt-pkg/indexcopy.h +++ b/apt-pkg/indexcopy.h @@ -22,7 +22,7 @@ class FileFd; class indexRecords; class pkgCdromStatus; -class IndexCopy +class IndexCopy /*{{{*/ { protected: @@ -45,8 +45,8 @@ class IndexCopy pkgCdromStatus *log); virtual ~IndexCopy() {}; }; - -class PackageCopy : public IndexCopy + /*}}}*/ +class PackageCopy : public IndexCopy /*{{{*/ { protected: @@ -57,8 +57,8 @@ class PackageCopy : public IndexCopy public: }; - -class SourceCopy : public IndexCopy + /*}}}*/ +class SourceCopy : public IndexCopy /*{{{*/ { protected: @@ -69,8 +69,8 @@ class SourceCopy : public IndexCopy public: }; - -class TranslationsCopy + /*}}}*/ +class TranslationsCopy /*{{{*/ { protected: pkgTagSection *Section; @@ -79,9 +79,8 @@ class TranslationsCopy bool CopyTranslations(string CDROM,string Name,vector &List, pkgCdromStatus *log); }; - - -class SigVerify + /*}}}*/ +class SigVerify /*{{{*/ { bool Verify(string prefix,string file, indexRecords *records); bool CopyMetaIndex(string CDROM, string CDName, @@ -91,7 +90,6 @@ class SigVerify bool CopyAndVerify(string CDROM,string Name,vector &SigList, vector PkgList,vector SrcList); }; - - + /*}}}*/ #endif diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc index b38596143..08f71feb0 100644 --- a/apt-pkg/indexfile.cc +++ b/apt-pkg/indexfile.cc @@ -41,7 +41,6 @@ pkgIndexFile::Type *pkgIndexFile::Type::GetType(const char *Type) return 0; } /*}}}*/ - // IndexFile::ArchiveInfo - Stub /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc index 502f454a8..77fe03d45 100644 --- a/apt-pkg/indexrecords.cc +++ b/apt-pkg/indexrecords.cc @@ -9,7 +9,7 @@ #include #include #include - + /*}}}*/ string indexRecords::GetDist() const { return this->Dist; @@ -31,7 +31,7 @@ const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey) return Entries[MetaKey]; } -bool indexRecords::Load(const string Filename) +bool indexRecords::Load(const string Filename) /*{{{*/ { FileFd Fd(Filename, FileFd::ReadOnly); pkgTagFile TagFile(&Fd, Fd.Size() + 256); // XXX @@ -85,8 +85,8 @@ bool indexRecords::Load(const string Filename) string Strdate = Section.FindS("Date"); // FIXME: verify this somehow? return true; } - -vector indexRecords::MetaKeys() + /*}}}*/ +vector indexRecords::MetaKeys() /*{{{*/ { std::vector keys; std::map::iterator I = Entries.begin(); @@ -96,8 +96,8 @@ vector indexRecords::MetaKeys() } return keys; } - -bool indexRecords::parseSumData(const char *&Start, const char *End, + /*}}}*/ +bool indexRecords::parseSumData(const char *&Start, const char *End, /*{{{*/ string &Name, string &Hash, size_t &Size) { Name = ""; @@ -154,7 +154,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End, Start = EntryEnd; //prepare for the next round return true; } - + /*}}}*/ indexRecords::indexRecords() { } diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index ca18f1d75..01b150722 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -129,7 +129,6 @@ bool pkgOrderList::IsMissing(PkgIterator Pkg) return true; } /*}}}*/ - // OrderList::DoRun - Does an order run /*{{{*/ // --------------------------------------------------------------------- /* The caller is expeted to have setup the desired probe state */ @@ -282,7 +281,6 @@ bool pkgOrderList::OrderConfigure() return DoRun(); } /*}}}*/ - // OrderList::Score - Score the package for sorting /*{{{*/ // --------------------------------------------------------------------- /* Higher scores order earlier */ @@ -433,7 +431,6 @@ int pkgOrderList::OrderCompareB(const void *a, const void *b) return strcmp(A.Name(),B.Name()); } /*}}}*/ - // OrderList::VisitDeps - Visit forward install dependencies /*{{{*/ // --------------------------------------------------------------------- /* This calls the dependency function for the normal forwards dependencies @@ -590,7 +587,6 @@ bool pkgOrderList::VisitNode(PkgIterator Pkg) return true; } /*}}}*/ - // OrderList::DepUnPackCrit - Critical UnPacking ordering /*{{{*/ // --------------------------------------------------------------------- /* Critical unpacking ordering strives to satisfy Conflicts: and @@ -668,13 +664,12 @@ bool pkgOrderList::DepUnPackCrit(DepIterator D) } return true; } - + /*}}}*/ // OrderList::DepUnPackPreD - Critical UnPacking ordering with depends /*{{{*/ // --------------------------------------------------------------------- /* Critical PreDepends (also configure immediate and essential) strives to ensure not only that all conflicts+predepends are met but that this - package will be immediately configurable when it is unpacked. - + package will be immediately configurable when it is unpacked. Loops are preprocessed and logged. */ bool pkgOrderList::DepUnPackPreD(DepIterator D) { @@ -892,7 +887,6 @@ bool pkgOrderList::DepRemove(DepIterator D) return true; } /*}}}*/ - // OrderList::AddLoop - Add a loop to the loop list /*{{{*/ // --------------------------------------------------------------------- /* We record the loops. This is a relic since loop breaking is done diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 304d1c653..cc9ce21c7 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -26,7 +26,7 @@ #include #include #include - + /*}}}*/ using namespace std; // PM::PackageManager - Constructor /*{{{*/ @@ -117,7 +117,6 @@ bool pkgPackageManager::FixMissing() return Resolve.ResolveByKeep() == true && Cache.BrokenCount() == 0; } /*}}}*/ - // PM::ImmediateAdd - Add the immediate flag recursivly /*{{{*/ // --------------------------------------------------------------------- /* This adds the immediate flag to the pkg and recursively to the @@ -152,7 +151,6 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer) return; } /*}}}*/ - // PM::CreateOrderList - Create the ordering class /*{{{*/ // --------------------------------------------------------------------- /* This populates the ordering list with all the packages that are diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h index e58515fb1..38733713f 100644 --- a/apt-pkg/pkgcache.h +++ b/apt-pkg/pkgcache.h @@ -27,7 +27,7 @@ using std::string; class pkgVersioningSystem; -class pkgCache +class pkgCache /*{{{*/ { public: // Cache element predeclarations @@ -146,8 +146,8 @@ class pkgCache pkgCache(MMap *Map,bool DoMap = true); virtual ~pkgCache() {}; }; - -// Header structure + /*}}}*/ +// Header structure /*{{{*/ struct pkgCache::Header { // Signature information @@ -195,8 +195,8 @@ struct pkgCache::Header bool CheckSizes(Header &Against) const; Header(); }; - -struct pkgCache::Package + /*}}}*/ +struct pkgCache::Package /*{{{*/ { // Pointers map_ptrloc Name; // Stringtable @@ -217,8 +217,8 @@ struct pkgCache::Package unsigned int ID; unsigned long Flags; }; - -struct pkgCache::PackageFile + /*}}}*/ +struct pkgCache::PackageFile /*{{{*/ { // Names map_ptrloc FileName; // Stringtable @@ -239,24 +239,24 @@ struct pkgCache::PackageFile unsigned int ID; time_t mtime; // Modification time for the file }; - -struct pkgCache::VerFile + /*}}}*/ +struct pkgCache::VerFile /*{{{*/ { map_ptrloc File; // PackageFile map_ptrloc NextFile; // PkgVerFile map_ptrloc Offset; // File offset unsigned short Size; }; - -struct pkgCache::DescFile + /*}}}*/ +struct pkgCache::DescFile /*{{{*/ { map_ptrloc File; // PackageFile map_ptrloc NextFile; // PkgVerFile map_ptrloc Offset; // File offset unsigned short Size; }; - -struct pkgCache::Version + /*}}}*/ +struct pkgCache::Version /*{{{*/ { map_ptrloc VerStr; // Stringtable map_ptrloc Section; // StringTable (StringItem) @@ -276,8 +276,8 @@ struct pkgCache::Version unsigned int ID; unsigned char Priority; }; - -struct pkgCache::Description + /*}}}*/ +struct pkgCache::Description /*{{{*/ { // Language Code store the description translation language code. If // the value has a 0 lenght then this is readed using the Package @@ -292,8 +292,8 @@ struct pkgCache::Description unsigned int ID; }; - -struct pkgCache::Dependency + /*}}}*/ +struct pkgCache::Dependency /*{{{*/ { map_ptrloc Version; // Stringtable map_ptrloc Package; // Package @@ -306,8 +306,8 @@ struct pkgCache::Dependency unsigned char Type; unsigned char CompareOp; }; - -struct pkgCache::Provides + /*}}}*/ +struct pkgCache::Provides /*{{{*/ { map_ptrloc ParentPkg; // Pacakge map_ptrloc Version; // Version @@ -315,13 +315,13 @@ struct pkgCache::Provides map_ptrloc NextProvides; // Provides map_ptrloc NextPkgProv; // Provides }; - -struct pkgCache::StringItem + /*}}}*/ +struct pkgCache::StringItem /*{{{*/ { map_ptrloc String; // Stringtable map_ptrloc NextItem; // StringItem }; - + /*}}}*/ #include inline pkgCache::PkgIterator pkgCache::PkgBegin() @@ -334,7 +334,7 @@ inline pkgCache::PkgFileIterator pkgCache::FileEnd() {return PkgFileIterator(*this,PkgFileP);}; // Oh I wish for Real Name Space Support -class pkgCache::Namespace +class pkgCache::Namespace /*{{{*/ { public: @@ -352,5 +352,5 @@ class pkgCache::Namespace typedef pkgCache::Dep Dep; typedef pkgCache::Flag Flag; }; - + /*}}}*/ #endif diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 397c19829..7833d6476 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -652,7 +652,6 @@ unsigned long pkgCacheGenerator::WriteUniqString(const char *S, return ItemP->String; } /*}}}*/ - // CheckValidity - Check that a cache is up-to-date /*{{{*/ // --------------------------------------------------------------------- /* This just verifies that each file in the list of index files exists, diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h index b6715294a..108b34207 100644 --- a/apt-pkg/pkgcachegen.h +++ b/apt-pkg/pkgcachegen.h @@ -28,7 +28,7 @@ class OpProgress; class MMap; class pkgIndexFile; -class pkgCacheGenerator +class pkgCacheGenerator /*{{{*/ { private: @@ -76,8 +76,8 @@ class pkgCacheGenerator pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress); ~pkgCacheGenerator(); }; - -// This is the abstract package list parser class. + /*}}}*/ +// This is the abstract package list parser class. /*{{{*/ class pkgCacheGenerator::ListParser { pkgCacheGenerator *Owner; @@ -126,7 +126,7 @@ class pkgCacheGenerator::ListParser ListParser() : FoundFileDeps(false) {}; virtual ~ListParser() {}; }; - + /*}}}*/ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, MMap **OutMap = 0,bool AllowMem = false); bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap); diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 17f3b1569..c2c98188a 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -22,7 +22,7 @@ #include #include -class pkgRecords +class pkgRecords /*{{{*/ { public: class Parser; @@ -42,8 +42,8 @@ class pkgRecords pkgRecords(pkgCache &Cache); ~pkgRecords(); }; - -class pkgRecords::Parser + /*}}}*/ +class pkgRecords::Parser /*{{{*/ { protected: @@ -73,5 +73,5 @@ class pkgRecords::Parser virtual ~Parser() {}; }; - + /*}}}*/ #endif diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc index 8e5d09e8a..589997081 100644 --- a/apt-pkg/vendorlist.cc +++ b/apt-pkg/vendorlist.cc @@ -10,7 +10,7 @@ pkgVendorList::~pkgVendorList() delete *I; } -// pkgVendorList::ReadMainList - Read list of known package vendors /*{{{*/ +// pkgVendorList::ReadMainList - Read list of known package vendors /*{{{*/ // --------------------------------------------------------------------- /* This also scans a directory of vendor files similar to apt.conf.d which can contain the usual suspects of distribution provided data. @@ -31,8 +31,8 @@ bool pkgVendorList::ReadMainList() return CreateList(Cnf); } - -bool pkgVendorList::Read(string File) + /*}}}*/ +bool pkgVendorList::Read(string File) /*{{{*/ { Configuration Cnf; if (ReadConfigFile(Cnf,File,true) == false) @@ -40,8 +40,8 @@ bool pkgVendorList::Read(string File) return CreateList(Cnf); } - -bool pkgVendorList::CreateList(Configuration& Cnf) + /*}}}*/ +bool pkgVendorList::CreateList(Configuration& Cnf) /*{{{*/ { for (vector::const_iterator I = VendorList.begin(); I != VendorList.end(); I++) @@ -110,8 +110,8 @@ bool pkgVendorList::CreateList(Configuration& Cnf) return !_error->PendingError(); } - -const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) + /*}}}*/ +const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) /*{{{*/ { for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I) { @@ -121,8 +121,8 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) return NULL; } - -const Vendor* pkgVendorList::FindVendor(const std::vector GPGVOutput) + /*}}}*/ +const Vendor* pkgVendorList::FindVendor(const std::vector GPGVOutput) /*{{{*/ { for (std::vector::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++) { @@ -142,3 +142,4 @@ const Vendor* pkgVendorList::FindVendor(const std::vector GPGVOutput) return NULL; } + /*}}}*/ diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 4431fd4f9..93558fa88 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -622,7 +622,7 @@ bool Depends(CommandLine &CmdL) return true; } - + /*}}}*/ // RDepends - Print out a reverse dependency tree - mbc /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -710,10 +710,7 @@ bool RDepends(CommandLine &CmdL) return true; } - /*}}}*/ - - // xvcg - Generate a graph for xvcg /*{{{*/ // --------------------------------------------------------------------- // Code contributed from Junichi Uekawa on 20 June 2002. @@ -933,8 +930,6 @@ bool XVcg(CommandLine &CmdL) return true; } /*}}}*/ - - // Dotty - Generate a graph for Dotty /*{{{*/ // --------------------------------------------------------------------- /* Dotty is the graphvis program for generating graphs. It is a fairly @@ -1270,15 +1265,16 @@ bool DisplayRecord(pkgCache::VerIterator V) return true; } /*}}}*/ -// Search - Perform a search /*{{{*/ -// --------------------------------------------------------------------- -/* This searches the package names and package descriptions for a pattern */ + struct ExDescFile { pkgCache::DescFile *Df; bool NameMatch; }; +// Search - Perform a search /*{{{*/ +// --------------------------------------------------------------------- +/* This searches the package names and package descriptions for a pattern */ bool Search(CommandLine &CmdL) { pkgCache &Cache = *GCache; @@ -1691,7 +1687,6 @@ bool Madison(CommandLine &CmdL) return true; } - /*}}}*/ // GenCaches - Call the main cache generator /*{{{*/ // --------------------------------------------------------------------- @@ -1765,8 +1760,7 @@ void CacheInitialize() _config->Set("help",false); } /*}}}*/ - -int main(int argc,const char *argv[]) +int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -1873,3 +1867,4 @@ int main(int argc,const char *argv[]) return 0; } + /*}}}*/ diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 379a433ea..342b6314a 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -40,8 +40,7 @@ using namespace std; - /*{{{*/ -class pkgCdromTextStatus : public pkgCdromStatus +class pkgCdromTextStatus : public pkgCdromStatus /*{{{*/ { protected: OpTextProgress Progress; @@ -98,9 +97,7 @@ OpProgress* pkgCdromTextStatus::GetOpProgress() { return &Progress; }; - /*}}}*/ - // DoAdd - Add a new CDROM /*{{{*/ // --------------------------------------------------------------------- /* This does the main add bit.. We show some status and things. The @@ -129,7 +126,6 @@ bool DoIdent(CommandLine &) return cdrom.Ident(ident, &log); } /*}}}*/ - // ShowHelp - Show the help screen /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -164,8 +160,7 @@ int ShowHelp() return 0; } /*}}}*/ - -int main(int argc,const char *argv[]) +int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -222,3 +217,4 @@ int main(int argc,const char *argv[]) return 0; } + /*}}}*/ diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc index 63fa0867c..9919a9c94 100644 --- a/cmdline/apt-config.cc +++ b/cmdline/apt-config.cc @@ -88,8 +88,7 @@ int ShowHelp() return 0; } /*}}}*/ - -int main(int argc,const char *argv[]) +int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -133,3 +132,4 @@ int main(int argc,const char *argv[]) return 0; } + /*}}}*/ diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index de22386b9..21ef1a050 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -348,8 +348,7 @@ bool Go(CommandLine &CmdL) return !_error->PendingError(); } /*}}}*/ - -int main(int argc, const char **argv) +int main(int argc, const char **argv) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -391,3 +390,4 @@ int main(int argc, const char **argv) return 0; } + /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index f5642c04d..97c83c9b0 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -597,7 +597,6 @@ void Stats(ostream &out,pkgDepCache &Dep) Dep.BadCount()); } /*}}}*/ - // CacheFile::NameComp - QSort compare by name /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -690,7 +689,10 @@ bool CacheFile::CheckDeps(bool AllowBroken) return true; } - + /*}}}*/ +// CheckAuth - check if each download comes form a trusted source /*{{{*/ +// --------------------------------------------------------------------- +/* */ static bool CheckAuth(pkgAcquire& Fetcher) { string UntrustedList; @@ -731,10 +733,7 @@ static bool CheckAuth(pkgAcquire& Fetcher) return _error->Error(_("There are problems and -y was used without --force-yes")); } - - /*}}}*/ - // InstallPackages - Actually download and install the packages /*{{{*/ // --------------------------------------------------------------------- /* This displays the informative messages describing what is going to @@ -1338,7 +1337,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, return Last; } /*}}}*/ - // DoUpdate - Update the package lists /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -1460,7 +1458,7 @@ bool DoAutomaticRemove(CacheFile &Cache) } return true; } - + /*}}}*/ // DoUpgrade - Upgrade all packages /*{{{*/ // --------------------------------------------------------------------- /* Upgrade all packages without installing new packages or erasing old @@ -1535,7 +1533,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, regfree(&Pattern); return res; } - + /*}}}*/ // DoInstall - Install packages from the command line /*{{{*/ // --------------------------------------------------------------------- /* Install named packages */ @@ -2702,8 +2700,7 @@ void SigWinch(int) #endif } /*}}}*/ - -int main(int argc,const char *argv[]) +int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -2835,3 +2832,4 @@ int main(int argc,const char *argv[]) return 0; } + /*}}}*/ diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index 7b2a74aed..171b0ba13 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -31,7 +31,7 @@ using namespace std; -struct PkgName +struct PkgName /*{{{*/ { string Name; string Ver; @@ -55,7 +55,7 @@ struct PkgName bool operator >(const PkgName &x) const {return Compare3(x) > 0;}; bool operator ==(const PkgName &x) const {return Compare3(x) == 0;}; }; - + /*}}}*/ // DoIt - Sort a single file /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -161,8 +161,7 @@ int ShowHelp() return 0; } /*}}}*/ - -int main(int argc,const char *argv[]) +int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Args Args[] = { {'h',"help","help",0}, @@ -206,3 +205,4 @@ int main(int argc,const char *argv[]) return 0; } + /*}}}*/ diff --git a/debian/changelog b/debian/changelog index fd37b9c71..8d6109224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ apt (0.7.22) UNRELEASED; urgency=low * support IsAutoInstallOk in the resolver too * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work correctly when downloading from multiple sites (Closes: #534752) + * add the various foldmarkers in apt-pkg & cmdline (no code change) [ Michael Vogt ] * honor the dpkg hold state in AutoInstOk (closes: #64141) diff --git a/po/apt-all.pot b/po/apt-all.pot index d1b705837..edcf59cc7 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-30 14:09+0200\n" +"POT-Creation-Date: 2009-06-30 21:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,8 +21,8 @@ msgid "Package %s version %s has an unmet dep:\n" msgstr "" #: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 -#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 -#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:793 cmdline/apt-cache.cc:1013 +#: cmdline/apt-cache.cc:1415 cmdline/apt-cache.cc:1566 #, c-format msgid "Unable to locate package %s" msgstr "" @@ -91,77 +91,77 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1213 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1293 +#: cmdline/apt-cache.cc:1289 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1447 +#: cmdline/apt-cache.cc:1443 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1520 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +#: cmdline/apt-cache.cc:1527 cmdline/apt-cache.cc:1613 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1528 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 +#: cmdline/apt-cache.cc:1540 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1593 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1573 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 +#: cmdline/apt-cache.cc:1575 cmdline/apt-cache.cc:1583 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1580 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1590 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1603 +#: cmdline/apt-cache.cc:1599 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1614 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1709 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1721 +#: cmdline/apt-cache.cc:1716 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -200,15 +200,15 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:78 +#: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:93 +#: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:117 +#: cmdline/apt-cdrom.cc:114 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -251,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:826 #, c-format msgid "Unable to write to %s" msgstr "" @@ -554,7 +554,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1659 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -653,118 +653,118 @@ msgstr "" msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:669 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:672 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:675 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:679 +#: cmdline/apt-get.cc:678 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:681 +#: cmdline/apt-get.cc:680 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:684 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:688 +#: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:710 +#: cmdline/apt-get.cc:712 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:714 +#: cmdline/apt-get.cc:716 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:721 +#: cmdline/apt-get.cc:723 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:723 +#: cmdline/apt-get.cc:725 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:883 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:776 +#: cmdline/apt-get.cc:775 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:785 +#: cmdline/apt-get.cc:784 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:796 +#: cmdline/apt-get.cc:795 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2001 cmdline/apt-get.cc:2034 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 -#: apt-pkg/cachefile.cc:65 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2328 +#: apt-pkg/cachefile.cc:64 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:836 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:841 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:845 +#: cmdline/apt-get.cc:844 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:849 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:853 +#: cmdline/apt-get.cc:852 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2177 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:873 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 +#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:909 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:892 +#: cmdline/apt-get.cc:891 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:893 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -772,74 +772,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 +#: cmdline/apt-get.cc:899 cmdline/apt-get.cc:918 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:914 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 +#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1397 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1005 +#: cmdline/apt-get.cc:1004 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 +#: cmdline/apt-get.cc:1005 cmdline/apt-get.cc:2234 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1012 +#: cmdline/apt-get.cc:1011 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1016 +#: cmdline/apt-get.cc:1015 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1020 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1022 +#: cmdline/apt-get.cc:1021 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1056 +#: cmdline/apt-get.cc:1055 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1066 +#: cmdline/apt-get.cc:1065 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1084 +#: cmdline/apt-get.cc:1083 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1095 +#: cmdline/apt-get.cc:1094 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1107 +#: cmdline/apt-get.cc:1106 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1112 +#: cmdline/apt-get.cc:1111 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1117 +#: cmdline/apt-get.cc:1116 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -847,68 +847,68 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1135 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1138 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1159 +#: cmdline/apt-get.cc:1158 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1167 +#: cmdline/apt-get.cc:1166 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1196 +#: cmdline/apt-get.cc:1195 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1198 +#: cmdline/apt-get.cc:1197 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1204 +#: cmdline/apt-get.cc:1203 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1310 +#: cmdline/apt-get.cc:1309 #, c-format msgid "No source package '%s' picking '%s' instead\n" msgstr "" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1346 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1361 +#: cmdline/apt-get.cc:1359 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1413 +#: cmdline/apt-get.cc:1411 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1445 +#: cmdline/apt-get.cc:1443 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1447 +#: cmdline/apt-get.cc:1445 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1452 +#: cmdline/apt-get.cc:1450 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -924,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1743 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1459 +#: cmdline/apt-get.cc:1457 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1478 +#: cmdline/apt-get.cc:1476 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1533 +#: cmdline/apt-get.cc:1531 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1671 +#: cmdline/apt-get.cc:1669 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1702 +#: cmdline/apt-get.cc:1700 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1713 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1718 +#: cmdline/apt-get.cc:1716 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -974,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1748 +#: cmdline/apt-get.cc:1746 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1866 +#: cmdline/apt-get.cc:1864 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1867 +#: cmdline/apt-get.cc:1865 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1896 +#: cmdline/apt-get.cc:1894 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1897 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1904 +#: cmdline/apt-get.cc:1902 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:1969 cmdline/apt-get.cc:1977 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:2077 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2107 cmdline/apt-get.cc:2346 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2156 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2186 +#: cmdline/apt-get.cc:2184 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2190 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2195 +#: cmdline/apt-get.cc:2193 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2201 +#: cmdline/apt-get.cc:2199 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:2230 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2260 +#: cmdline/apt-get.cc:2258 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:2270 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2271 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2290 +#: cmdline/apt-get.cc:2288 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2309 +#: cmdline/apt-get.cc:2307 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2323 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2351 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2373 +#: cmdline/apt-get.cc:2371 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2425 +#: cmdline/apt-get.cc:2423 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2478 +#: cmdline/apt-get.cc:2476 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2514 +#: cmdline/apt-get.cc:2512 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2541 +#: cmdline/apt-get.cc:2539 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2553 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2559 +#: cmdline/apt-get.cc:2557 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2589 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2632 +#: cmdline/apt-get.cc:2630 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1163,7 +1163,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2799 +#: cmdline/apt-get.cc:2796 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1388,7 +1388,7 @@ msgstr "" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 +#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:33 #, c-format msgid "Unable to read %s" msgstr "" @@ -1418,9 +1418,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760 -#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834 -#: apt-pkg/pkgcachegen.cc:957 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:759 +#: apt-pkg/pkgcachegen.cc:828 apt-pkg/pkgcachegen.cc:833 +#: apt-pkg/pkgcachegen.cc:956 msgid "Reading package lists" msgstr "" @@ -2044,7 +2044,7 @@ msgid "Unable to stat the mount point %s" msgstr "" #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 +#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:39 #, c-format msgid "Unable to change to %s" msgstr "" @@ -2209,16 +2209,16 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 +#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:192 apt-pkg/depcache.cc:196 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:221 +#: apt-pkg/depcache.cc:220 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:227 +#: apt-pkg/depcache.cc:226 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2263,7 +2263,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2283,7 +2283,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:428 +#: apt-pkg/packagemanager.cc:426 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2302,17 +2302,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1147 +#: apt-pkg/algorithms.cc:1146 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1149 +#: apt-pkg/algorithms.cc:1148 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 +#: apt-pkg/algorithms.cc:1423 apt-pkg/algorithms.cc:1425 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2330,12 +2330,12 @@ msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:828 +#: apt-pkg/acquire.cc:825 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:830 +#: apt-pkg/acquire.cc:827 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2364,7 +2364,7 @@ msgstr "" msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:56 #, c-format msgid "Unable to stat %s." msgstr "" @@ -2373,11 +2373,11 @@ msgstr "" msgid "You must put some 'source' URIs in your sources.list" msgstr "" -#: apt-pkg/cachefile.cc:71 +#: apt-pkg/cachefile.cc:70 msgid "The package lists or status file could not be parsed or opened." msgstr "" -#: apt-pkg/cachefile.cc:75 +#: apt-pkg/cachefile.cc:74 msgid "You may want to run apt-get update to correct these problems" msgstr "" @@ -2474,16 +2474,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:690 +#: apt-pkg/pkgcachegen.cc:689 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:775 +#: apt-pkg/pkgcachegen.cc:774 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909 +#: apt-pkg/pkgcachegen.cc:901 apt-pkg/pkgcachegen.cc:908 msgid "IO Error saving source cache" msgstr "" @@ -2492,39 +2492,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:401 +#: apt-pkg/acquire-item.cc:394 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426 +#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1118 +#: apt-pkg/acquire-item.cc:1101 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1231 +#: apt-pkg/acquire-item.cc:1211 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1290 +#: apt-pkg/acquire-item.cc:1270 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1331 +#: apt-pkg/acquire-item.cc:1311 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1418 +#: apt-pkg/acquire-item.cc:1398 msgid "Size mismatch" msgstr "" @@ -2533,99 +2533,99 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:529 +#: apt-pkg/cdrom.cc:525 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:563 +#: apt-pkg/cdrom.cc:559 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:590 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:612 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:620 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:638 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:678 +#: apt-pkg/cdrom.cc:673 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" "zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:715 +#: apt-pkg/cdrom.cc:710 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:739 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:760 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:764 +#: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:790 +#: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:799 +#: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:822 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:824 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:827 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -- cgit v1.2.3-70-g09d2 From 6910a2accecd7c8e8493b74130d8dbf3972014a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 30 Jun 2009 21:44:24 +0200 Subject: * add hook for MarkInstall and MarkDelete (closes: #470035) * honor the dpkg hold state in new Marker hooks (closes: #64141) Combine the proposed AutoInstOk and IsAutoInstallOk to more general hooks for MarkInstall (and another one for MarkDelete) with the same parameters as the call these hooks should check. --- apt-pkg/algorithms.cc | 25 ++++--------------- apt-pkg/depcache.cc | 67 +++++++++++++++++++++++++++++++++++++-------------- apt-pkg/depcache.h | 40 ++++++++++++++++++------------ debian/changelog | 5 ++-- po/apt-all.pot | 8 +++--- 5 files changed, 84 insertions(+), 61 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 68a4af8ed..a30a02edb 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -984,26 +984,11 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) // Consider other options if (InOr == false) { - if (Cache.AutoInstOk(I, Cache[I].CandidateVerIter(Cache),Start) == true) - { - if (Debug == true) - clog << " Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; - Cache.MarkDelete(I); - if (Counter > 1) - { - if (Scores[Pkg->ID] > Scores[I->ID]) - Scores[I->ID] = Scores[Pkg->ID]; - } - } else { - /* The dependency of the TargetPkg would be satisfiable with I but it is - forbidden to install I automatical, so anything we can do is hold - back the TargetPkg. - */ - if (Debug == true) - clog << " Hold back " << Start.TargetPkg().Name() << - " rather than change denied AutoInstall " << I.Name() << endl; - Cache.MarkKeep(Start.TargetPkg()); - } + if (Debug == true) + clog << " Removing " << I.Name() << " rather than change " << Start.TargetPkg().Name() << endl; + Cache.MarkDelete(I); + if (Counter > 1 && Scores[Pkg->ID] > Scores[I->ID]) + Scores[I->ID] = Scores[Pkg->ID]; } } } diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index a284a05c7..7c86204f5 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -769,7 +769,7 @@ void pkgDepCache::MarkKeep(PkgIterator const &Pkg, bool Soft, bool FromUser, // --------------------------------------------------------------------- /* */ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, - unsigned long Depth) + unsigned long Depth, bool FromUser) { // Simplifies other routines. if (Pkg.end() == true) @@ -791,6 +791,13 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, if (Pkg->VersionList == 0) return; + // check if we are allowed to install the package + if (IsDeleteOk(Pkg,rPurge,Depth,FromUser) == false) + { + MarkKeep(Pkg,false,FromUser,Depth+1); + return; + } + if (DebugMarker == true) std::clog << OutputInDepth(Depth) << "MarkDelete " << Pkg << std::endl; @@ -808,6 +815,23 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, AddSizes(Pkg); } /*}}}*/ +// DepCache::IsDeleteOk - check if it is ok to remove this package /*{{{*/ +// --------------------------------------------------------------------- +/* The default implementation just honors dpkg hold + But an application using this library can override this method + to control the MarkDelete behaviour */ +bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, + unsigned long Depth, bool FromUser) +{ + if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold) + { + if (DebugMarker == true) + std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << std::endl; + return false; + } + return true; +} + /*}}}*/ // DepCache::MarkInstall - Put the package in the install state /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -843,6 +867,14 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, // We dont even try to install virtual packages.. if (Pkg->VersionList == 0) return; + + // check if we are allowed to install the package + if (IsInstallOk(Pkg,AutoInst,Depth,FromUser) == false) + { + MarkKeep(Pkg,false,FromUser,Depth+1); + return; + } + /* Target the candidate version and remove the autoflag. We reset the autoflag below if this was called recursively. Otherwise the user should have the ability to de-auto a package by changing its state */ @@ -871,7 +903,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, AddStates(Pkg); Update(Pkg); AddSizes(Pkg); - + if (AutoInst == false) return; @@ -1001,8 +1033,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, } } - if (InstPkg.end() == false && - AutoInstOk(InstPkg, (*this)[InstPkg].CandidateVerIter(*this), Start)) + if (InstPkg.end() == false) { if(DebugAutoInstall == true) std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.Name() @@ -1040,30 +1071,30 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, PkgIterator Pkg = Ver.ParentPkg(); if (Start->Type != Dep::DpkgBreaks) - { - if(AutoInstOk(Pkg, VerIterator(*this), Start)) - MarkDelete(Pkg); - } - else - if (PkgState[Pkg->ID].CandidateVer != *I && - AutoInstOk(Pkg, VerIterator(*this, PkgState[Pkg->ID].CandidateVer), Start)) - MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); + MarkDelete(Pkg,false,Depth + 1, false); + else if (PkgState[Pkg->ID].CandidateVer != *I) + MarkInstall(Pkg,true,Depth + 1, false, ForceImportantDeps); } continue; } } } /*}}}*/ -// DepCache::AutoInstOk - check if it is to install this package /*{{{*/ +// DepCache::IsInstallOk - check if it is ok to install this package /*{{{*/ // --------------------------------------------------------------------- /* The default implementation just honors dpkg hold - But an application using this library can override this method + But an application using this library can override this method to control the MarkInstall behaviour */ -bool pkgDepCache::AutoInstOk(const PkgIterator &Pkg, - const VerIterator &v, - const DepIterator &d) +bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, + unsigned long Depth, bool FromUser) { - return (Pkg->SelectedState != pkgCache::State::Hold); + if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold) + { + if (DebugMarker == true) + std::clog << OutputInDepth(Depth) << "Hold prevents MarkInstall of " << Pkg << std::endl; + return false; + } + return true; } /*}}}*/ // DepCache::SetReInstall - Set the reinstallation flag /*{{{*/ diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index 10f9c1091..44a7f8c02 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -363,20 +363,6 @@ class pkgDepCache : protected pkgCache::Namespace */ virtual bool MarkFollowsSuggests(); - /** \return \b true if it's OK for MarkInstall to recursively - * install the given version of the given package. - * - * \param p the package that MarkInstall wants to install. - * \param v the version being installed, or an end iterator - * if p is being removed. - * \param d the dependency being fixed. - * - * The default implementation unconditionally returns \b true. - */ - virtual bool AutoInstOk(const PkgIterator &p, - const VerIterator &v, - const DepIterator &d); - /** \brief Update the Marked and Garbage fields of all packages. * * This routine is implicitly invoked after all state manipulators @@ -406,7 +392,7 @@ class pkgDepCache : protected pkgCache::Namespace void MarkKeep(PkgIterator const &Pkg, bool Soft = false, bool FromUser = true, unsigned long Depth = 0); void MarkDelete(PkgIterator const &Pkg, bool Purge = false, - unsigned long Depth = 0); + unsigned long Depth = 0, bool FromUser = true); void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, unsigned long Depth = 0, bool FromUser = true, bool ForceImportantDeps = false); @@ -417,7 +403,29 @@ class pkgDepCache : protected pkgCache::Namespace /** Set the "is automatically installed" flag of Pkg. */ void MarkAuto(const PkgIterator &Pkg, bool Auto); // @} - + + /** \return \b true if it's OK for MarkInstall to install + * the given package. + * + * \param Pkg the package that MarkInstall wants to install. + * \param AutoInst needs a previous MarkInstall this package? + * \param Depth recursive deep of this Marker call + * \param FromUser was the install requested by the user? + */ + virtual bool IsInstallOk(const PkgIterator &Pkg,bool AutoInst = true, + unsigned long Depth = 0, bool FromUser = true); + + /** \return \b true if it's OK for MarkDelete to remove + * the given package. + * + * \param Pkg the package that MarkDelete wants to remove. + * \param Purge should we purge instead of "only" remove? + * \param Depth recursive deep of this Marker call + * \param FromUser was the remove requested by the user? + */ + virtual bool IsDeleteOk(const PkgIterator &Pkg,bool Purge = false, + unsigned long Depth = 0, bool FromUser = true); + // This is for debuging void Update(OpProgress *Prog = 0); diff --git a/debian/changelog b/debian/changelog index 8d6109224..ab8da4c6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,14 +29,13 @@ apt (0.7.22) UNRELEASED; urgency=low * add Debug::pkgProblemResolver::ShowScores and make the scores adjustable * do not write state file in simulate mode (closes: #433007) - * add hook for auto-install (closes: #470035) - * support IsAutoInstallOk in the resolver too + * add hook for MarkInstall and MarkDelete (closes: #470035) * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work correctly when downloading from multiple sites (Closes: #534752) * add the various foldmarkers in apt-pkg & cmdline (no code change) [ Michael Vogt ] - * honor the dpkg hold state in AutoInstOk (closes: #64141) + * honor the dpkg hold state in new Marker hooks (closes: #64141) [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in diff --git a/po/apt-all.pot b/po/apt-all.pot index edcf59cc7..12e15110e 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -780,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1397 +#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1382 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -2302,17 +2302,17 @@ msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1146 +#: apt-pkg/algorithms.cc:1131 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1148 +#: apt-pkg/algorithms.cc:1133 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1423 apt-pkg/algorithms.cc:1425 +#: apt-pkg/algorithms.cc:1408 apt-pkg/algorithms.cc:1410 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." -- cgit v1.2.3-70-g09d2 From 9f5bf66a6218d1aec3f42713084078c18947eade Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 1 Jul 2009 10:25:41 +0200 Subject: versions with a pin of -1 shouldn't be a candidate (Closes: #355237) --- apt-pkg/policy.cc | 8 ++++++++ debian/changelog | 1 + po/apt-all.pot | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 98576fc91..e33d563a1 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -120,6 +120,14 @@ pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator Pkg) signed Max = GetPriority(Pkg); pkgCache::VerIterator Pref = GetMatch(Pkg); + // no package = no candidate version + if (Pkg.end() == true) + return Pref; + + // packages with a pin lower than 0 have no newer candidate than the current version + if (Max < 0) + return Pkg.CurrentVer(); + /* Falling through to the default version.. Setting Max to zero effectively excludes everything <= 0 which are the non-automatic priorities.. The status file is given a prio of 100 which will exclude diff --git a/debian/changelog b/debian/changelog index ab8da4c6c..412435fad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ apt (0.7.22) UNRELEASED; urgency=low * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work correctly when downloading from multiple sites (Closes: #534752) * add the various foldmarkers in apt-pkg & cmdline (no code change) + * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) [ Michael Vogt ] * honor the dpkg hold state in new Marker hooks (closes: #64141) diff --git a/po/apt-all.pot b/po/apt-all.pot index 12e15110e..199b7f843 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-30 21:08+0200\n" +"POT-Creation-Date: 2009-07-01 10:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2381,16 +2381,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:281 +#: apt-pkg/policy.cc:289 msgid "Invalid record in the preferences file, no Package header" msgstr "" -#: apt-pkg/policy.cc:303 +#: apt-pkg/policy.cc:311 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:311 +#: apt-pkg/policy.cc:319 msgid "No priority (or zero) specified for pin" msgstr "" -- cgit v1.2.3-70-g09d2 From d2b08f7e6e4b82d04df2412f55549b0ee5d38dc4 Mon Sep 17 00:00:00 2001 From: Marcos Alvarez Costales Date: Wed, 1 Jul 2009 22:43:12 +0200 Subject: Updated Asturian translation --- debian/changelog | 2 +- po/ast.po | 449 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 251 insertions(+), 200 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd37b9c71..668192967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ apt (0.7.22) UNRELEASED; urgency=low - ca.po. Closes: #531921 * Added translations - ast.po (Asturian by Marcos Alvareez Costales). - Closes: #529007, #529730 + Closes: #529007, #529730, #535328 [ David Kalnischkies ] * [ABI break] support '#' in apt.conf and /etc/apt/preferences diff --git a/po/ast.po b/po/ast.po index 01ee81acd..0af6d0c18 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,9 +2,10 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-12 22:07+0100\n" -"PO-Revision-Date: 2009-05-21 09:37+0100\n" -"Last-Translator: Marcos \n" +"POT-Creation-Date: 2009-06-30 14:09+0200\n" +"PO-Revision-Date: 2009-07-01 18:09+0100\n" +"Last-Translator: Marcos Alvarez Costales \n" "Language-Team: Asturian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -152,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compilu en %s %s\n" @@ -647,79 +648,79 @@ msgstr "Problema al desenllazar %s" msgid "Failed to rename %s to %s" msgstr "Nun pudo renomase %s como %s" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin d'espresin regular - %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Los siguientes paquetes nun cumplen dependencies:" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "pero %s ta instalu" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "pero %s ta pa instalar" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "pero nun ye instalable" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "pero ye un paquete virtual" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "pero nun ta instalu" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "pero nun va instalase" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " o" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "Van instalase los siguientes paquetes NUEVOS:" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "Los siguientes paquetes van DESANICIASE:" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "Los siguientes paquetes tan retenos:" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "Los siguientes paquetes van actualizase:" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "Los siguientes paquetes van DESACTUALIZASE:" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "Van camudase los siguientes paquetes retenos:" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (por %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -727,143 +728,143 @@ msgstr "" "AVISU: Los siguientes paquetes esenciales van desaniciase.\n" "Esto NUN hai que facelo si nun sabes esautamente lo que faes!" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu actualizaos, %lu nuevos instalaos, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "%lu reinstalaos, " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "%lu desactualizaos, " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu para desaniciar y %lu nun actualizaos.\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nun instalaos dafechu o desaniciaos.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid "Correcting dependencies..." msgstr "Iguando dependencies..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid " failed." msgstr " fall." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to correct dependencies" msgstr "Nun pudieron iguase les dependencies" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 msgid "Unable to minimize the upgrade set" msgstr "Nun pue amenorgase'l conxuntu d'actualizacin" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:681 msgid " Done" msgstr " Fecho" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Habres d'executar `apt-get -f install' para igualo." -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:688 msgid "Unmet dependencies. Try using -f." msgstr "Dependencies incumples. Tntalo usando -f." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:710 msgid "WARNING: The following packages cannot be authenticated!" msgstr "AVISU: Nun pudieron autenticase los siguientes paquetes!" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:714 msgid "Authentication warning overridden.\n" msgstr "Avisu d'autenticacin saltu.\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:721 msgid "Install these packages without verification [y/N]? " msgstr "Instalar esos paquetes ensin verificacin [s/N]? " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:723 msgid "Some packages could not be authenticated" msgstr "Dellos paquetes nun pudieron autenticase" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 msgid "There are problems and -y was used without --force-yes" msgstr "Hai problemes y utilizose -y ensin --force-yes" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Error internu, InstallPackages llamose con paquetes fraaos!" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:785 msgid "Packages need to be removed but remove is disabled." msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgu." -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:796 msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun fin" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1992 cmdline/apt-get.cc:2025 +#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2073 cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nun pudo lleese la llista de fontes." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:837 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "Que raro.. Los tamaos nun concasen, escribe a apt@packages.debian.org" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Hai que descargar %sB/%sB d'archivos.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:845 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Hai que descargar %sB d'archivos.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Tres d'esta operacin, van usase %sB d'espaciu de discu adicional.\n" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:853 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2168 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Conseose Trivial Only pero sta nun ye una operacin trivial." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:892 msgid "Yes, do as I say!" msgstr "S, facer lo que digo!" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -874,28 +875,28 @@ msgstr "" "Pa continuar escribe la frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 msgid "Abort." msgstr "Encaboxar." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:915 msgid "Do you want to continue [Y/n]? " msgstr "Quies continuar [S/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2216 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fall algamar %s %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1005 msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2225 +#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de slo descarga" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1012 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -903,47 +904,47 @@ msgstr "" "Nun pudieron algamase dellos archivos, seique executando apt-get update o " "tentando --fix-missing?" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1016 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambu de mediu nun ta sofitao actualmente" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1021 msgid "Unable to correct missing packages." msgstr "Nun pudieron iguase los paquetes que falten." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1022 msgid "Aborting install." msgstr "Encaboxando la instalacin." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1056 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escoyendo %s nel llugar de %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, ya ta instalau y la actualizacin nun ta activada.\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s ye un paquete virtual ufru por:\n" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1107 msgid " [Installed]" msgstr " [Instalu]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 msgid "You should explicitly select one to install." msgstr "Has d'escoyer esplcitamente unu pa instalar." -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1117 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,53 +955,58 @@ msgstr "" "Esto puede significar que falta el paquete, ta arrumbu, o slo\n" "ta disponible dende otra fonte\n" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1136 msgid "However the following packages replace it:" msgstr "Sicas, los siguientes paquetes reemplacenlu:" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1139 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s nun tien candidatu pa instalacin" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1159 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstalacin de %s nun ye dable, nun pue descargase.\n" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "%s is already the newest version.\n" msgstr "%s y ta na versin ms nueva.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontr la distribucin '%s' pa '%s'" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontr la versin '%s' pa '%s'" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1204 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escoyida la versin %s (%s) pa %s\n" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1310 +#, c-format +msgid "No source package '%s' picking '%s' instead\n" +msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' eh\n" + +#: cmdline/apt-get.cc:1348 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1361 msgid "Unable to lock the list directory" msgstr "Nun pudo bloquiase'l direutoriu de llista" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1413 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" -#: cmdline/apt-get.cc:1435 +#: cmdline/apt-get.cc:1445 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1008,11 +1014,11 @@ msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1447 msgid "Use 'apt-get autoremove' to remove them." msgstr "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1452 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1030,43 +1036,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin pue aidar a resolver la situacin:" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1459 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompi coses" -#: cmdline/apt-get.cc:1468 +#: cmdline/apt-get.cc:1478 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompi coses" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find task %s" msgstr "Nun pudo alcontrase la tarea %s" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:1671 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1702 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustu como instalu manualmente.\n" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1715 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Habres d'executar `apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1718 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1074,7 +1080,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "consea una solucin)." -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1730 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1086,117 +1092,117 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1748 msgid "Broken packages" msgstr "Paquetes fraaos" -#: cmdline/apt-get.cc:1767 +#: cmdline/apt-get.cc:1777 msgid "The following extra packages will be installed:" msgstr "Instalarnse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1866 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:1857 +#: cmdline/apt-get.cc:1867 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1896 msgid "Calculating upgrade... " msgstr "Calculando l'autualizacin... " -#: cmdline/apt-get.cc:1888 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1904 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:1960 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes fra coses" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2079 msgid "Must specify at least one package to fetch source for" msgstr "Has de consear polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2098 cmdline/apt-get.cc:2337 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2147 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru y descargu '%s'\n" -#: cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:2186 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2232 msgid "Failed to fetch some archives." msgstr "Fall la descarga de dellos archivos." -#: cmdline/apt-get.cc:2249 +#: cmdline/apt-get.cc:2260 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orde de desempaquetu '%s'.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2273 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n" -#: cmdline/apt-get.cc:2279 +#: cmdline/apt-get.cc:2290 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orde build '%s'.\n" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2309 msgid "Child process failed" msgstr "Fall el procesu fu" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2325 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que consear polo menos un paquete pa verificar les dependencies de " "construccin" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2353 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2373 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construccin.\n" -#: cmdline/apt-get.cc:2414 +#: cmdline/apt-get.cc:2425 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1205,7 +1211,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:2467 +#: cmdline/apt-get.cc:2478 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1214,32 +1220,32 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versin " "disponible del paquete %s satisfaz los requisitos de versin" -#: cmdline/apt-get.cc:2503 +#: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalu %s ye " "demasiao nuevu" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2541 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2555 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construccin de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2559 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construccin" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2591 msgid "Supported modules:" msgstr "Mdulos sofitaos:" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1255,7 +1261,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1292,8 +1298,8 @@ msgstr "" "\n" "Comandos:\n" " update - Algamar nueva llista de paquetes\n" -" upgrade - Facer una actualizacin\n" -" install - Instalar nuevos paquetes (pkg ye libc6 no libc6.deb)\n" +" upgrade - Facer una anovacin\n" +" install - Instalar nuevos paquetes (pkg ye libc6 non libc6.deb)\n" " remove - Desaniciar paquetes\n" " autoremove - Desaniciar automticamente tolos paquetes non usaos\n" " purge - Quitar y desaniciar paquetes\n" @@ -1310,7 +1316,7 @@ msgstr "" " -q Salida Log - ensn indicacin de progresu\n" " -qq Ensn salida excepto pa fallos\n" " -d Baxar slo - NON instalar o desempaquetar los archivos\n" -" -s No aicin. Facer una simulacin ordenada\n" +" -s Non aicin. Facer una simulacin ordenada\n" " -y Asumir Yes pa toles entruges y nun visualizar la peticin\n" " -f Intentar correxir un sistema con dependencies frayaes\n" " -m Intentar siguir si los archivos nun tan disponibles\n" @@ -1325,6 +1331,19 @@ msgstr "" "pa ms informacin y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" +#: cmdline/apt-get.cc:2799 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" +"NOTA: Esto slo ye una simulacin!\n" +" apt-get necesita privilexos de root pa la execucin real.\n" +" Ten tamin en cuenta que'l bloquu ta desactivu,\n" +" asina que nun dependen de la pertinencia de la verdadera situacin " +"actual!" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Oxe " @@ -1557,7 +1576,7 @@ msgstr "Sobreescribiendo concordancia del paquete ensin versi msgid "File %s/%s overwrites the one in the package %s" msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -1858,7 +1877,7 @@ msgstr "Gandi msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexn" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1942,40 +1961,40 @@ msgstr "Daqu msgid "Unable to connect to %s %s:" msgstr "Nun se pudo coneutar a %s %s:" -#: methods/gpgv.cc:65 +#: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "Nun se pudo acceder al aniellu de claves '%s'" -#: methods/gpgv.cc:101 +#: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando." -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so gella dixital?!" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "Atopse polo menos una robla mala." -#: methods/gpgv.cc:214 +#: methods/gpgv.cc:232 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Nun se pudo executar '%s' pa verificar la robla (ta instalu gpgv?)" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "Fallu desconocu al executar gpgv" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1993,80 +2012,80 @@ msgstr "Nun se pudo abrir una tuber msgid "Read error from %s process" msgstr "Fallu de llectura dende'l procesu %s" -#: methods/http.cc:377 +#: methods/http.cc:379 msgid "Waiting for headers" msgstr "Esperando les testeres" -#: methods/http.cc:523 +#: methods/http.cc:525 #, c-format msgid "Got a single header line over %u chars" msgstr "Obtvose una sola llinia de testera penriba de %u carauteres" -#: methods/http.cc:531 +#: methods/http.cc:533 msgid "Bad header line" msgstr "Fallu na llinia testera" -#: methods/http.cc:550 methods/http.cc:557 +#: methods/http.cc:552 methods/http.cc:559 msgid "The HTTP server sent an invalid reply header" msgstr "El sirvidor HTTP mand una testera incorreuta de rempuesta" -#: methods/http.cc:586 +#: methods/http.cc:588 msgid "The HTTP server sent an invalid Content-Length header" msgstr "El sirvidor HTTP mand una testera incorreuta de Content-Length" -#: methods/http.cc:601 +#: methods/http.cc:603 msgid "The HTTP server sent an invalid Content-Range header" msgstr "El sirvidor HTTP mand una testera incorreuta de Content-Range" -#: methods/http.cc:603 +#: methods/http.cc:605 msgid "This HTTP server has broken range support" msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" -#: methods/http.cc:627 +#: methods/http.cc:629 msgid "Unknown date format" msgstr "Formatu de data desconocu" -#: methods/http.cc:774 +#: methods/http.cc:782 msgid "Select failed" msgstr "Fall la escoyeta" -#: methods/http.cc:779 +#: methods/http.cc:787 msgid "Connection timed out" msgstr "Gandi'l tiempu de conexn" -#: methods/http.cc:802 +#: methods/http.cc:810 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:833 +#: methods/http.cc:841 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:861 +#: methods/http.cc:869 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:875 +#: methods/http.cc:883 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn." -#: methods/http.cc:877 +#: methods/http.cc:885 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 +#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196 msgid "Failed to truncate file" msgstr "Fall al francer el ficheru" -#: methods/http.cc:1105 +#: methods/http.cc:1141 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1122 methods/http.cc:1177 +#: methods/http.cc:1158 methods/http.cc:1213 msgid "Connection failed" msgstr "Fallo la conexn" -#: methods/http.cc:1229 +#: methods/http.cc:1305 msgid "Internal error" msgstr "Fallu internu" @@ -2088,7 +2107,31 @@ msgstr "" "Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau de APT::Cache-" "Limit. El valor actual ye : %lu. (man 5 apt.conf)" -#: apt-pkg/contrib/strutl.cc:1014 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:335 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "%lid %lih %limin %lis" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:342 +#, c-format +msgid "%lih %limin %lis" +msgstr "%lih %limin %lis" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:349 +#, c-format +msgid "%limin %lis" +msgstr "%limin %lis" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:354 +#, c-format +msgid "%lis" +msgstr "%lis" + +#: apt-pkg/contrib/strutl.cc:1029 #, c-format msgid "Selection %s not found" msgstr "Escoyeta %s que nun s'atopa" @@ -2103,43 +2146,43 @@ msgstr "Triba d'abreviatura que nun se reconoz: msgid "Opening configuration file %s" msgstr "Abriendo ficheros de configuracin %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque." -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Fallu de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:699 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempus del valor" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:739 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Les directives pueden facese slo nel nivel cimeru" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:746 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones aeraes" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:759 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:810 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru" @@ -2282,101 +2325,105 @@ msgstr "Hai problemes desvenceyando'l ficheru %s" msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "Cach de paquetes balera." -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "El ficheru de cach de paquetes ta tollu" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "El ficheru de cach de paquetes ye una versin incompatible" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Esti APT nun soporta'l sistema de versiones '%s'" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "La cach de paquetes crese pa una arquitectura estremada" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "Depende de" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "Predepende de" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "Suxer" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "Recomienda" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "En conflictu con" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "Sustituye a" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "Fai obsoletu a" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "Ruempe" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "Aumenta" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "importante" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "requeru" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "estndar" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "opcional" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "Creando rbol de dependencies" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "Versiones candidates" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "Xeneracin de dependencies" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "Lleendo informacin d'estu" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:221 #, c-format msgid "Failed to open StateFile %s" msgstr "Nun se pudo abrir el ficheru d'estu %s" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:227 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Fall la escritura del ficheru temporal d'estu %s" @@ -2464,7 +2511,7 @@ msgid "" msgstr "" "El paquete %s necesita reinstalase, pero nun s'alcuentra un archivu pa el." -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1147 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2472,11 +2519,11 @@ msgstr "" "Error, pkgProblemResolver::Resolve xener fraaures, esto puede ser pola mor " "de paquetes retenos." -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1149 msgid "Unable to correct problems, you have held broken packages." msgstr "Nun pueden iguase los problemes; tienes paquetes fraaos retenidos." -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2516,7 +2563,7 @@ msgstr "Nun pudo alncontrase'l controlador de m msgid "Method %s did not start correctly" msgstr "El mtodu %s nun entam correchamente" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Por favor, introduz el discu '%s' nel presu '%s' y calca Intro." @@ -2548,17 +2595,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Has d'executar apt-get update pa iguar estos problemes" -#: apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:281 msgid "Invalid record in the preferences file, no Package header" msgstr "" "Rexistru invlidu nel ficheru de preferencies, nun hai cabecera Paquete" -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:303 #, c-format msgid "Did not understand pin type %s" msgstr "Nun s'entiende'l tipu de pin %s" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:311 msgid "No priority (or zero) specified for pin" msgstr "Nun hai priorid (o ye cero) conseada pa pin" @@ -2884,12 +2931,16 @@ msgstr "Prepar msgid "Completely removed %s" msgstr "Desinstalse dafechu %s" -#: apt-pkg/deb/dpkgpm.cc:791 +#: apt-pkg/deb/dpkgpm.cc:789 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nun puede escribise nel rexistru, fall openpty() (/dev/pts nun ta " "montu?)\n" +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "Non bloquiu" + #: methods/rred.cc:219 msgid "Could not patch file" msgstr "Nun fui quien a parchiar el ficheru" -- cgit v1.2.3-70-g09d2 From e68ca100711326895126dc1fca86a2124a8e8d63 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Jul 2009 15:46:54 +0200 Subject: Support /etc/apt/preferences.d (Closes: #535512) --- apt-pkg/cachefile.cc | 2 +- apt-pkg/init.cc | 1 + apt-pkg/policy.cc | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- apt-pkg/policy.h | 1 + cmdline/apt-cache.cc | 4 ++-- debian/apt.dirs | 1 + debian/changelog | 3 ++- 7 files changed, 57 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 1a84aea54..5b5e26497 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -92,7 +92,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; - if (ReadPinFile(*Policy) == false) + if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false) return false; // Create the dependency cache diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 338bef66c..4abfb726f 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -67,6 +67,7 @@ bool pkgInitConfig(Configuration &Cnf) Cnf.Set("Dir::Etc::main","apt.conf"); Cnf.Set("Dir::Etc::parts","apt.conf.d"); Cnf.Set("Dir::Etc::preferences","preferences"); + Cnf.Set("Dir::Etc::preferencesparts","preferences.d"); Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); // State diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 98576fc91..b9a951990 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -32,6 +32,9 @@ #include +#include +#include +#include #include #include /*}}}*/ @@ -253,6 +256,51 @@ class PreferenceSection : public pkgTagSection Stop = (const char*) memchr(Stop,'\n',End-Stop); } }; + + +bool ReadPinDir(pkgPolicy &Plcy,string Dir) +{ + if (Dir.empty() == true) + Dir = _config->FindDir("Dir::Etc::PreferencesParts"); + + DIR *D = opendir(Dir.c_str()); + if (D == 0) + return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); + + vector List; + + for (struct dirent *Ent = readdir(D); Ent != 0; Ent = readdir(D)) + { + if (Ent->d_name[0] == '.') + continue; + + // Skip bad file names ala run-parts + const char *C = Ent->d_name; + for (; *C != 0; C++) + if (isalpha(*C) == 0 && isdigit(*C) == 0 && *C != '_' && *C != '-') + break; + if (*C != 0) + continue; + + // Make sure it is a file and not something else + string File = flCombine(Dir,Ent->d_name); + struct stat St; + if (stat(File.c_str(),&St) != 0 || S_ISREG(St.st_mode) == 0) + continue; + + List.push_back(File); + } + closedir(D); + + sort(List.begin(),List.end()); + + // Read the files + for (vector::const_iterator I = List.begin(); I != List.end(); I++) + if (ReadPinFile(Plcy, *I) == false) + return false; + return true; +} + /*}}}*/ // ReadPinFile - Load the pin file into a Policy /*{{{*/ // --------------------------------------------------------------------- @@ -278,7 +326,7 @@ bool ReadPinFile(pkgPolicy &Plcy,string File) { string Name = Tags.FindS("Package"); if (Name.empty() == true) - return _error->Error(_("Invalid record in the preferences file, no Package header")); + return _error->Error(_("Invalid record in the preferences file %s, no Package header"), File.c_str()); if (Name == "*") Name = string(); diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h index d5f3b2f75..4894682fa 100644 --- a/apt-pkg/policy.h +++ b/apt-pkg/policy.h @@ -84,5 +84,6 @@ class pkgPolicy : public pkgDepCache::Policy }; bool ReadPinFile(pkgPolicy &Plcy,string File = ""); +bool ReadPinDir(pkgPolicy &Plcy,string Dir = ""); #endif diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 4431fd4f9..acef8dc5e 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -401,7 +401,7 @@ bool DumpAvail(CommandLine &Cmd) pkgCache &Cache = *GCache; pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false) + if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) return false; unsigned long Count = Cache.HeaderP->PackageCount+1; @@ -1515,7 +1515,7 @@ bool Policy(CommandLine &CmdL) pkgCache &Cache = *GCache; pkgPolicy Plcy(&Cache); - if (ReadPinFile(Plcy) == false) + if (ReadPinFile(Plcy) == false || ReadPinDir(Plcy) == false) return false; // Print out all of the package files diff --git a/debian/apt.dirs b/debian/apt.dirs index 47f60e7e3..fb6716c35 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -3,6 +3,7 @@ usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt etc/apt/apt.conf.d +etc/apt/preferences.d etc/apt/sources.list.d etc/logrotate.d var/cache/apt/archives/partial diff --git a/debian/changelog b/debian/changelog index 668192967..9024f687d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,8 +41,9 @@ apt (0.7.22) UNRELEASED; urgency=low * apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. * Introduce support for the Enhances field. (Closes: #137583) + * Support /etc/apt/preferences.d (Closes: #535512) - -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 + -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 apt (0.7.21) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 5541fea3f0c6b4b40048c161b9201b03243ac3a9 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Jul 2009 16:20:13 +0200 Subject: configure-index: document Dir::Etc::SourceParts and some other options (Closes: #459605) --- debian/changelog | 2 ++ doc/examples/configure-index | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 668192967..6ffd0459f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ apt (0.7.22) UNRELEASED; urgency=low * apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. * Introduce support for the Enhances field. (Closes: #137583) + * configure-index: document Dir::Etc::SourceParts and some other options + (Closes: #459605) -- Christian Perrier Wed, 22 Apr 2009 10:13:54 +0200 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index cea0dcc09..b2bc95e69 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -219,10 +219,13 @@ Dir "/" // Config files Etc "etc/apt/" { - SourceList "sources.list"; Main "apt.conf"; - Preferences "preferences"; Parts "apt.conf.d/"; + Preferences "preferences"; + SourceList "sources.list"; + SourceParts "sources.list.d"; + VendorList "vendors.list"; + VendorParts "vendors.list.d"; }; // Locations of binaries -- cgit v1.2.3-70-g09d2 From 2db5a2dd1b2e9690f73c6c41f3d67b7d7956c293 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 6 Jul 2009 17:29:12 +0200 Subject: Remove Eugene V. Lyubimkin from uploaders as requested. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 615a0efcb..f4aa1eebf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,7 @@ apt (0.7.22) UNRELEASED; urgency=low * Support /etc/apt/preferences.d, by adding ReadPinDir() (Closes: #535512) * configure-index: document Dir::Etc::SourceParts and some other options (Closes: #459605) + * Remove Eugene V. Lyubimkin from uploaders as requested. -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 diff --git a/debian/control b/debian/control index 8f5d6ff75..84c411509 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , - Luca Bruno , Eugene V. Lyubimkin + Luca Bruno Standards-Version: 3.8.1.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From f1c6a8ca0511c623a16bb804ed2c5b6c26c83d78 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 8 Jul 2009 01:03:15 +0200 Subject: [contrib/mmap] implements a theoretical dynamic growing mmap based on Michael Vogts patch in #195018 this commit implements the use of mmap (as preferred) instead of a static char array. In theory this made it possible to grow the mmap as needed, but as it is currently impossible to move the mmap around in the memory the grow is likely to fail but it improve the memory usage a bit, so it is not totally useless for now - and maybe we can adjust the pointers in the future... --- apt-pkg/contrib/mmap.cc | 84 ++++++++++++++++++++++++++++++++++++------------- apt-pkg/contrib/mmap.h | 2 ++ debian/changelog | 2 ++ 3 files changed, 67 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 04a45811b..073bc9eb3 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -13,11 +13,6 @@ libc6 generates warnings -- which should be errors, g++ isn't properly strict. - The configure test notes that some OS's have broken private mmap's - so on those OS's we can't use mmap. This means we have to use - configure to test mmap and can't rely on the POSIX - _POSIX_MAPPED_FILES test. - ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ @@ -166,13 +161,23 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) /*}}}*/ // DynamicMMap::DynamicMMap - Constructor for a non-file backed map /*{{{*/ // --------------------------------------------------------------------- -/* This is just a fancy malloc really.. */ +/* We try here to use mmap to reserve some space - this is much more + cooler than the fallback solution to simply allocate a char array + and could come in handy later than we are able to grow such an mmap */ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) : MMap(Flags | NoImmMap | UnMapped), Fd(0), WorkSpace(WorkSpace) { if (_error->PendingError() == true) return; - + +#ifdef _POSIX_MAPPED_FILES + // use anonymous mmap() to get the memory + Base = (unsigned char*) mmap(0, WorkSpace, PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); + if(Base != MAP_FAILED) + return; +#endif + // fallback to a static allocated space Base = new unsigned char[WorkSpace]; memset(Base,0,WorkSpace); iSize = 0; @@ -185,7 +190,11 @@ DynamicMMap::~DynamicMMap() { if (Fd == 0) { +#ifdef _POSIX_MAPPED_FILES + munmap(Base, WorkSpace); +#else delete [] (unsigned char *)Base; +#endif return; } @@ -207,14 +216,16 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) iSize = Result + Size; - // Just in case error check - if (Result + Size > WorkSpace) + // try to grow the buffer + while(Result + Size > WorkSpace) { - _error->Error(_("Dynamic MMap ran out of room. Please increase the size " - "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); - return 0; + if(!Grow()) + { + _error->Error(_("Dynamic MMap ran out of room. Please increase the size " + "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); + return 0; + } } - return Result; } /*}}}*/ @@ -234,7 +245,6 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) if (I->ItemSize == ItemSize) break; } - // No pool is allocated, use an unallocated one if (I == Pools + PoolCount) { @@ -270,14 +280,17 @@ unsigned long DynamicMMap::WriteString(const char *String, unsigned long Len) { unsigned long Result = iSize; - // Just in case error check - if (Result + Len > WorkSpace) + // try to grow the buffer + while(Result + Len > WorkSpace) { - _error->Error(_("Dynamic MMap ran out of room. Please increase the size " - "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); - return 0; - } - + if(!Grow()) + { + _error->Error(_("Dynamic MMap ran out of room. Please increase the size " + "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); + return 0; + } + } + if (Len == (unsigned long)-1) Len = strlen(String); iSize += Len + 1; @@ -286,3 +299,32 @@ unsigned long DynamicMMap::WriteString(const char *String, return Result; } /*}}}*/ +// DynamicMMap::Grow - Grow the mmap /*{{{*/ +// --------------------------------------------------------------------- +/* This method will try to grow the mmap we currently use. This doesn't + work most of the time because we can't move the mmap around in the + memory for now as this would require to adjust quite a lot of pointers + but why we should not at least try to grow it before we give up? */ +bool DynamicMMap::Grow() +{ +#ifdef _POSIX_MAPPED_FILES + unsigned long newSize = WorkSpace + 1024*1024; + + if(Fd != 0) + { + Fd->Seek(newSize - 1); + char C = 0; + Fd->Write(&C,sizeof(C)); + } + + Base = mremap(Base, WorkSpace, newSize, 0); + if(Base == MAP_FAILED) + return false; + + WorkSpace = newSize; + return true; +#else + return false; +#endif +} + /*}}}*/ diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index 19cf7582d..bde62217d 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -84,6 +84,8 @@ class DynamicMMap : public MMap unsigned long WorkSpace; Pool *Pools; unsigned int PoolCount; + + bool Grow(); public: diff --git a/debian/changelog b/debian/changelog index 412435fad..27b798fe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.7.22) UNRELEASED; urgency=low correctly when downloading from multiple sites (Closes: #534752) * add the various foldmarkers in apt-pkg & cmdline (no code change) * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) + * prefer mmap as memory allocator in MMap instead of a static char + array which can (at least in theory) grow dynamic [ Michael Vogt ] * honor the dpkg hold state in new Marker hooks (closes: #64141) -- cgit v1.2.3-70-g09d2 From 13eb93fcb6a03afd8fc05fa2b4c60046473e8507 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 8 Jul 2009 01:11:16 +0200 Subject: add a segfault handler to MMap to show the Cache-Limit message, which can be deactivated with MMap::SegfaultHandler=false (Closes: 535218) --- apt-pkg/contrib/mmap.cc | 24 ++++++++++++++++++++++++ debian/changelog | 2 ++ 2 files changed, 26 insertions(+) (limited to 'debian') diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 073bc9eb3..5f56178f4 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -19,6 +19,7 @@ #define _BSD_SOURCE #include #include +#include #include @@ -26,6 +27,8 @@ #include #include #include +#include +#include #include /*}}}*/ @@ -136,6 +139,20 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) } /*}}}*/ +// DynamicMMapSegfaultHandler /*{{{*/ +// --------------------------------------------------------------------- +/* In theory, the mmap should never segfault because we check the available + size of our mmap before we use it, but there are a few reports out there + which state that the mmap segfaults without further notice. So this handler + will take care of all these segfaults which should never happen... */ +void DynamicMMapSegfaultHandler(int) +{ + _error->Error(_("Dynamic MMap segfaults, most likely because it ran out of room. " + "Please increase the size of APT::Cache-Limit. (man 5 apt.conf)")); + _error->DumpErrors(); + exit(EXIT_FAILURE); +} + /*}}}*/ // DynamicMMap::DynamicMMap - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -170,6 +187,13 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) : if (_error->PendingError() == true) return; + if (_config->FindB("MMap::SegfaultHandler",true) == true) + { + struct sigaction sa; + sa.sa_handler = DynamicMMapSegfaultHandler; + sigaction(SIGSEGV, &sa, NULL); + } + #ifdef _POSIX_MAPPED_FILES // use anonymous mmap() to get the memory Base = (unsigned char*) mmap(0, WorkSpace, PROT_READ|PROT_WRITE, diff --git a/debian/changelog b/debian/changelog index 27b798fe5..aba5e4cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.22) UNRELEASED; urgency=low * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) * prefer mmap as memory allocator in MMap instead of a static char array which can (at least in theory) grow dynamic + * add a segfault handler to MMap to show the Cache-Limit message, which + can be deactivated with MMap::SegfaultHandler=false (Closes: 535218) [ Michael Vogt ] * honor the dpkg hold state in new Marker hooks (closes: #64141) -- cgit v1.2.3-70-g09d2 From db13bafbde62b4ce4624e8166162a82e33052d38 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 10 Jul 2009 08:00:45 +0200 Subject: German translation update --- debian/changelog | 1 + po/de.po | 383 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 193 insertions(+), 191 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f4aa1eebf..fe03eb8e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ apt (0.7.22) UNRELEASED; urgency=low - fr.po - it.po. Closes: #531758 - ca.po. Closes: #531921 + - de.po. Closes: #536430 * Added translations - ast.po (Asturian by Marcos Alvareez Costales). Closes: #529007, #529730, #535328 diff --git a/po/de.po b/po/de.po index 8dcd52cd8..44ea7132c 100644 --- a/po/de.po +++ b/po/de.po @@ -1,21 +1,23 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# Holger Wansing , 2008. +# Holger Wansing , 2008, 2009. # Jens Seidel , 2008. # Michael Piefel , 2001, 2002, 2003, 2004, 2006. # Rüdiger Kuhlmann , 2002. # +# msgid "" msgstr "" -"Project-Id-Version: apt 0.7.14\n" +"Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 12:25+0200\n" -"PO-Revision-Date: 2008-11-13 21:31+0100\n" +"POT-Creation-Date: 2009-06-30 14:09+0200\n" +"PO-Revision-Date: 2009-07-09 22:22+0200\n" "Last-Translator: Holger Wansing \n" -"Language-Team: \n" +"Language-Team: Debian German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);>\n" #: cmdline/apt-cache.cc:143 #, c-format @@ -158,7 +160,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2582 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" @@ -201,7 +203,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -"Aufruf: apt-cache [Optionen] Befehl\n" +"Aufruf: apt-cache [Optionen] befehl\n" " apt-cache [Optionen] add datei1 [datei2 ...]\n" " apt-cache [Optionen] showpkg paket1 [paket2 ...]\n" " apt-cache [Optionen] showsrc paket1 [paket2 ...]\n" @@ -663,79 +665,79 @@ msgstr "Problem beim Unlinking von %s" msgid "Failed to rename %s to %s" msgstr "Konnte %s nicht in %s umbenennen" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1658 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "aber %s ist installiert" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "aber %s soll installiert werden" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "ist aber nicht installierbar" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "ist aber ein virtuelles Paket" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "ist aber nicht installiert" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "soll aber nicht installiert werden" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " oder" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "Die folgenden NEUEN Pakete werden installiert:" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "Die folgenden Pakete werden ENTFERNT:" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "Die folgenden Pakete sind zurückgehalten worden:" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "Die folgenden Pakete werden aktualisiert:" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "Die folgenden gehaltenen Pakete werden verändert:" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "%s (wegen %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" @@ -743,145 +745,145 @@ msgstr "" "WARNUNG: Die folgenden essentiellen Pakete werden entfernt.\n" "Dies sollte NICHT geschehen, außer Sie wissen genau, was Sie tun!" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu aktualisiert, %lu neu installiert, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "%lu erneut installiert, " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "%lu deaktualisiert, " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu zu entfernen und %lu nicht aktualisiert.\n" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu nicht vollständig installiert oder entfernt.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:670 msgid "Correcting dependencies..." msgstr "Abhängigkeiten werden korrigiert..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:673 msgid " failed." msgstr " fehlgeschlagen." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:676 msgid "Unable to correct dependencies" msgstr "Kann Abhängigkeiten nicht korrigieren" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:679 msgid "Unable to minimize the upgrade set" msgstr "Kann die Menge zu aktualisierender Pakete nicht minimieren" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:681 msgid " Done" msgstr " Fertig" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:685 msgid "You might want to run `apt-get -f install' to correct these." msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:688 msgid "Unmet dependencies. Try using -f." msgstr "Nicht erfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:710 msgid "WARNING: The following packages cannot be authenticated!" msgstr "WARNUNG: Die folgenden Pakete können nicht authentifiziert werden!" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:714 msgid "Authentication warning overridden.\n" msgstr "Authentifizierungswarnung überstimmt.\n" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:721 msgid "Install these packages without verification [y/N]? " msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:723 msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:776 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "Interner Fehler, InstallPackages mit defekten Paketen aufgerufen!" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:785 msgid "Packages need to be removed but remove is disabled." msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:796 msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036 msgid "Unable to lock the download directory" msgstr "Kann das Downloadverzeichnis nicht sperren." -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2080 cmdline/apt-get.cc:2326 +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:837 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie an " "apt@packages.debian.org" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:842 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:845 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:850 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:853 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2175 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179 #, c-format msgid "Couldn't determine free space in %s" msgstr "Konnte freien Platz in %s nicht bestimmen" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:874 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:892 msgid "Yes, do as I say!" msgstr "Ja, tue was ich sage!" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -892,28 +894,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:915 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2223 apt-pkg/algorithms.cc:1349 +#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1400 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Konnte %s nicht holen %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1005 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1012 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -921,48 +923,48 @@ msgstr "" "Konnte einige Archive nicht herunterladen; vielleicht »apt-get update« " "ausführen oder mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1016 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1021 msgid "Unable to correct missing packages." msgstr "Konnte fehlende Pakete nicht korrigieren." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1022 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1056 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Hinweis: wähle %s an Stelle von %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1066 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1084 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1107 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1112 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1117 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -973,60 +975,60 @@ msgstr "" "Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1136 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1139 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1159 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Erneute Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1167 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1204 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1307 +#: cmdline/apt-get.cc:1310 #, c-format msgid "No source package '%s' picking '%s' instead\n" -msgstr "" +msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n" -#: cmdline/apt-get.cc:1345 +#: cmdline/apt-get.cc:1348 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente" -#: cmdline/apt-get.cc:1358 +#: cmdline/apt-get.cc:1361 msgid "Unable to lock the list directory" msgstr "Kann das Listenverzeichnis nicht sperren" -#: cmdline/apt-get.cc:1410 +#: cmdline/apt-get.cc:1413 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1445 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1034,11 +1036,11 @@ msgstr "" "Die folgenden Pakete wurden automatisch installiert und werden nicht länger " "benötigt:" -#: cmdline/apt-get.cc:1444 +#: cmdline/apt-get.cc:1447 msgid "Use 'apt-get autoremove' to remove them." msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1452 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1057,44 +1059,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1452 cmdline/apt-get.cc:1742 +#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1456 +#: cmdline/apt-get.cc:1459 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1478 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find task %s" msgstr "Konnte Task %s nicht finden" -#: cmdline/apt-get.cc:1645 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684 #, c-format msgid "Couldn't find package %s" msgstr "Konnte Paket %s nicht finden" -#: cmdline/apt-get.cc:1668 +#: cmdline/apt-get.cc:1671 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1702 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1715 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: cmdline/apt-get.cc:1715 +#: cmdline/apt-get.cc:1718 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1102,7 +1104,7 @@ msgstr "" "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jegliche Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1730 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1114,120 +1116,120 @@ msgstr "" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1745 +#: cmdline/apt-get.cc:1748 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1777 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1863 +#: cmdline/apt-get.cc:1866 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1867 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1896 msgid "Calculating upgrade... " msgstr "Berechne Upgrade (Paketaktualisierung) ..." -#: cmdline/apt-get.cc:1895 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1904 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:2079 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:2105 cmdline/apt-get.cc:2344 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348 #, c-format msgid "Unable to find a source package for %s" msgstr "Kann Quellpaket für %s nicht finden" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2158 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe schon heruntergeladene Datei »%s«\n" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2186 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2191 +#: cmdline/apt-get.cc:2195 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2197 +#: cmdline/apt-get.cc:2201 #, c-format msgid "Fetch source %s\n" msgstr "Hole Quelle %s\n" -#: cmdline/apt-get.cc:2228 +#: cmdline/apt-get.cc:2232 msgid "Failed to fetch some archives." msgstr "Konnte einige Archive nicht holen." -#: cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:2260 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2272 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2273 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2290 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2305 +#: cmdline/apt-get.cc:2309 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2325 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2353 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2369 +#: cmdline/apt-get.cc:2373 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bau-Abhängigkeiten.\n" -#: cmdline/apt-get.cc:2421 +#: cmdline/apt-get.cc:2425 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1236,7 +1238,7 @@ msgstr "" "%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden " "werden kann." -#: cmdline/apt-get.cc:2474 +#: cmdline/apt-get.cc:2478 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1245,33 +1247,32 @@ msgstr "" "%s-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare " "Version von Paket %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " "zu neu." -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2541 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" -#: cmdline/apt-get.cc:2551 +#: cmdline/apt-get.cc:2555 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2555 +#: cmdline/apt-get.cc:2559 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2587 +#: cmdline/apt-get.cc:2591 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2628 -#, fuzzy +#: cmdline/apt-get.cc:2632 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1330,7 +1331,7 @@ msgstr "" " remove – Pakete entfernen\n" " autoremove – alle nicht mehr verwendeten Pakete automatisch " "entfernen\n" -" purge – entferne Pakete restlos\n" +" purge – entferne Pakete restlos (inkl. Konfigurationsdateien)\n" " source – Quellarchive herunterladen\n" " build-dep – die Bau-Abhängigkeiten für Quellpakete konfigurieren\n" " dist-upgrade – spezielles Upgrade (Paketaktualisierung) für die " @@ -1362,6 +1363,14 @@ msgstr "" "weitergehende Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" +#: cmdline/apt-get.cc:2799 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "OK " @@ -1597,7 +1606,7 @@ msgstr "Überschreibe Paket-Treffer ohne Version für %s" msgid "File %s/%s overwrites the one in the package %s" msgstr "Datei %s/%s überschreibt die Datei in Paket %s" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -2135,32 +2144,34 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::" +"Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:335 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%liT %liS %liMin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:342 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%liS %liMin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:349 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%liMin %lis" #. s means seconds #: apt-pkg/contrib/strutl.cc:354 #, c-format msgid "%lis" -msgstr "" +msgstr "%lis" -#: apt-pkg/contrib/strutl.cc:1018 +#: apt-pkg/contrib/strutl.cc:1029 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" @@ -2175,43 +2186,43 @@ msgstr "Nicht erkannte Typabkürzung: »%c«" msgid "Opening configuration file %s" msgstr "Öffne Konfigurationsdatei %s" -#: apt-pkg/contrib/configuration.cc:662 +#: apt-pkg/contrib/configuration.cc:663 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block fängt ohne Namen an." -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" -#: apt-pkg/contrib/configuration.cc:698 +#: apt-pkg/contrib/configuration.cc:699 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert" -#: apt-pkg/contrib/configuration.cc:738 +#: apt-pkg/contrib/configuration.cc:739 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" -#: apt-pkg/contrib/configuration.cc:745 +#: apt-pkg/contrib/configuration.cc:746 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 +#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Eingefügt von hier" -#: apt-pkg/contrib/configuration.cc:758 +#: apt-pkg/contrib/configuration.cc:759 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" -#: apt-pkg/contrib/configuration.cc:809 +#: apt-pkg/contrib/configuration.cc:810 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" @@ -2355,101 +2366,105 @@ msgstr "Beim Unlinking der Datei trat ein Problem auf" msgid "Problem syncing the file" msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "Leerer Paket-Cache" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "Die Paket-Cache-Datei ist beschädigt" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor" -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht" -#: apt-pkg/pkgcache.cc:153 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "Der Paket-Cache wurde für eine andere Architektur aufgebaut" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "Hängt ab" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "Hängt ab (vorher)" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "Schlägt vor" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "Empfiehlt" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "Kollidiert" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "Ersetzt" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "Veraltet" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "Stört" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "wichtig" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "erforderlich" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "standard" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "optional" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "Lese Status-Informationen ein" -#: apt-pkg/depcache.cc:219 +#: apt-pkg/depcache.cc:221 #, c-format msgid "Failed to open StateFile %s" msgstr "Konnte Statusdatei %s nicht öffnen" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:227 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "Konnte temporäre Statusdatei %s nicht schreiben" @@ -2539,7 +2554,7 @@ msgstr "" "Das Paket %s muss neu installiert werden, ich kann aber kein Archiv dafür " "finden." -#: apt-pkg/algorithms.cc:1107 +#: apt-pkg/algorithms.cc:1147 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2547,11 +2562,11 @@ msgstr "" "Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " "könnte durch gehaltene Pakete hervorgerufen worden sein." -#: apt-pkg/algorithms.cc:1109 +#: apt-pkg/algorithms.cc:1149 msgid "Unable to correct problems, you have held broken packages." msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene defekte Pakete." -#: apt-pkg/algorithms.cc:1375 apt-pkg/algorithms.cc:1377 +#: apt-pkg/algorithms.cc:1426 apt-pkg/algorithms.cc:1428 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2628,16 +2643,16 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." -#: apt-pkg/policy.cc:267 +#: apt-pkg/policy.cc:281 msgid "Invalid record in the preferences file, no Package header" msgstr "Ungültiger Eintrag in Einstellungsdatei, keine »Package«-Kopfzeilen" -#: apt-pkg/policy.cc:289 +#: apt-pkg/policy.cc:303 #, c-format msgid "Did not understand pin type %s" msgstr "Konnte Pinning-Typ (pin type) %s nicht verstehen" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:311 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" @@ -2979,7 +2994,7 @@ msgstr "" #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -msgstr "" +msgstr "Nicht gesperrt" #: methods/rred.cc:219 msgid "Could not patch file" @@ -2988,17 +3003,3 @@ msgstr "Konnte Datei nicht patchen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung zu früh beendet" - -#~ msgid "Dynamic MMap ran out of room" -#~ msgstr "Kein Platz für Dynamic MMap" - -#~ msgid "" -#~ "Since you only requested a single operation it is extremely likely that\n" -#~ "the package is simply not installable and a bug report against\n" -#~ "that package should be filed." -#~ msgstr "" -#~ "Da Sie nur eine einzige Operation angefordert haben, ist es sehr " -#~ "wahrscheinlich,\n" -#~ "dass das Paket einfach nicht installierbar ist; Sie sollten einen " -#~ "Fehlerbericht\n" -#~ "gegen dieses Paket erstellen." -- cgit v1.2.3-70-g09d2 From 6e7c6c3f58193fd5db3d9d598ac65a1571522a58 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 14 Jul 2009 11:23:38 +0200 Subject: * debian/apt.cron.daily: - if the timestamp is too far in the future, delete it --- debian/apt.cron.daily | 7 +++++++ debian/changelog | 2 ++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 5c5ca88c7..b40bb2c30 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -76,6 +76,13 @@ check_stamp() #echo "stampfile: $1" #echo "interval=$interval, now=$now, stamp=$stamp, delta=$delta" + # remove timestamps a day (or more) in the future and force re-check + if [ $stamp -gt $(($now+86400)) ]; then + echo "WARNING: file $stamp_file has a timestamp in the future: $stamp" + rm -f "$stamp_file" + return 0 + fi + if [ $delta -ge $interval ]; then return 0 fi diff --git a/debian/changelog b/debian/changelog index fe03eb8e0..7f14502e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ apt (0.7.22) UNRELEASED; urgency=low [ Michael Vogt ] * honor the dpkg hold state in AutoInstOk (closes: #64141) + * debian/apt.cron.daily: + - if the timestamp is too far in the future, delete it [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in -- cgit v1.2.3-70-g09d2 From 6009e60d0192832277242438ad7ca2fc24a4c075 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 15 Jul 2009 23:57:07 +0200 Subject: display warnings instead of errors if the parts dirs doesn't exist Parts dirs are /etc/apt/{sources.list,apt.conf,preferences}.d (in the default setup) --- apt-pkg/cachefile.cc | 4 +++- apt-pkg/init.cc | 17 ++++++++++++----- apt-pkg/policy.cc | 11 ++++++++++- apt-pkg/sourcelist.cc | 8 ++++++-- debian/changelog | 1 + 5 files changed, 32 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc index 0b1efb9ff..790312dc8 100644 --- a/apt-pkg/cachefile.cc +++ b/apt-pkg/cachefile.cc @@ -48,6 +48,7 @@ pkgCacheFile::~pkgCacheFile() /* */ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) { + const bool ErrorWasEmpty = _error->empty(); if (WithLock == true) if (_system->Lock() == false) return false; @@ -70,7 +71,7 @@ bool pkgCacheFile::BuildCaches(OpProgress &Progress,bool WithLock) return _error->Error(_("The package lists or status file could not be parsed or opened.")); /* This sux, remove it someday */ - if (_error->empty() == false) + if (ErrorWasEmpty == true && _error->empty() == false) _error->Warning(_("You may want to run apt-get update to correct these problems")); Cache = new pkgCache(Map); @@ -91,6 +92,7 @@ bool pkgCacheFile::Open(OpProgress &Progress,bool WithLock) Policy = new pkgPolicy(Cache); if (_error->PendingError() == true) return false; + if (ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false) return false; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 4abfb726f..63caade36 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -81,19 +81,26 @@ bool pkgInitConfig(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (Cfg != 0 && FileExists(Cfg) == true) - Res &= ReadConfigFile(Cnf,Cfg); - + if (Cfg != 0) + { + if (FileExists(Cfg) == true) + Res &= ReadConfigFile(Cnf,Cfg); + else + _error->WarningE("FileExists",_("Unable to read %s"),Cfg); + } + // Read the configuration parts dir string Parts = Cnf.FindDir("Dir::Etc::parts"); if (FileExists(Parts) == true) Res &= ReadConfigDir(Cnf,Parts); - + else + _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); + // Read the main config file string FName = Cnf.FindFile("Dir::Etc::main"); if (FileExists(FName) == true) Res &= ReadConfigFile(Cnf,FName); - + if (Res == false) return false; diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc index 26d1c17bd..81fdb0431 100644 --- a/apt-pkg/policy.cc +++ b/apt-pkg/policy.cc @@ -267,12 +267,21 @@ class PreferenceSection : public pkgTagSection /*}}}*/ // ReadPinDir - Load the pin files from this dir into a Policy /*{{{*/ // --------------------------------------------------------------------- -/* */ +/* This will load each pin file in the given dir into a Policy. If the + given dir is empty the dir set in Dir::Etc::PreferencesParts is used. + Note also that this method will issue a warning if the dir does not + exists but it will return true in this case! */ bool ReadPinDir(pkgPolicy &Plcy,string Dir) { if (Dir.empty() == true) Dir = _config->FindDir("Dir::Etc::PreferencesParts"); + if (FileExists(Dir) == false) + { + _error->WarningE("FileExists",_("Unable to read %s"),Dir.c_str()); + return true; + } + DIR *D = opendir(Dir.c_str()); if (D == 0) return _error->Errno("opendir",_("Unable to read %s"),Dir.c_str()); diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index fea645078..47a08ad90 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -158,12 +158,16 @@ bool pkgSourceList::ReadMainList() // entries in sources.list.d. string Main = _config->FindFile("Dir::Etc::sourcelist"); if (FileExists(Main) == true) - Res &= ReadAppend(Main); + Res &= ReadAppend(Main); + else + _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str()); string Parts = _config->FindDir("Dir::Etc::sourceparts"); if (FileExists(Parts) == true) Res &= ReadSourceDir(Parts); - + else + _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); + return Res; } /*}}}*/ diff --git a/debian/changelog b/debian/changelog index 786b8a86f..e4da484d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ apt (0.7.22) UNRELEASED; urgency=low array which can (at least in theory) grow dynamic * add a segfault handler to MMap to show the Cache-Limit message, which can be deactivated with MMap::SegfaultHandler=false (Closes: 535218) + * display warnings instead of errors if the parts dirs doesn't exist [ Michael Vogt ] * honor the dpkg hold state in new Marker hooks (closes: #64141) -- cgit v1.2.3-70-g09d2 From 04f4e1a3b110ef5ff8870816169f8f0b9eb23dce Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 16 Jul 2009 12:59:39 +0200 Subject: * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc: - Support reading until EOF if Size=0 to match behaviour of SHA1Summation and SHA256Summation --- apt-pkg/contrib/hashes.cc | 13 +++++++++---- apt-pkg/contrib/md5.cc | 13 +++++++++---- debian/changelog | 3 +++ 3 files changed, 21 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index fcc2f887c..70f2db06d 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -108,11 +108,16 @@ bool Hashes::AddFD(int Fd,unsigned long Size) { unsigned char Buf[64*64]; int Res = 0; - while (Size != 0) + int ToEOF = (Size == 0); + while (Size != 0 || ToEOF) { - Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); - if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) - return false; + unsigned n = sizeof(Buf); + if (!ToEOF) n = min(Size,(unsigned long)n); + Res = read(Fd,Buf,n); + if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read + return false; + if (ToEOF && Res == 0) // EOF + break; Size -= Res; MD5.Add(Buf,Res); SHA1.Add(Buf,Res); diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc index a095f8f0f..2bfd70f1b 100644 --- a/apt-pkg/contrib/md5.cc +++ b/apt-pkg/contrib/md5.cc @@ -294,11 +294,16 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size) { unsigned char Buf[64*64]; int Res = 0; - while (Size != 0) + int ToEOF = (Size == 0); + while (Size != 0 || ToEOF) { - Res = read(Fd,Buf,min(Size,(unsigned long)sizeof(Buf))); - if (Res < 0 || (unsigned)Res != min(Size,(unsigned long)sizeof(Buf))) - return false; + unsigned n = sizeof(Buf); + if (!ToEOF) n = min(Size,(unsigned long)n); + Res = read(Fd,Buf,n); + if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read + return false; + if (ToEOF && Res == 0) // EOF + break; Size -= Res; Add(Buf,Res); } diff --git a/debian/changelog b/debian/changelog index 7f14502e7..fc88e08cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,9 @@ apt (0.7.22) UNRELEASED; urgency=low * configure-index: document Dir::Etc::SourceParts and some other options (Closes: #459605) * Remove Eugene V. Lyubimkin from uploaders as requested. + * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc: + - Support reading until EOF if Size=0 to match behaviour of + SHA1Summation and SHA256Summation -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 -- cgit v1.2.3-70-g09d2 From 7b139dabdcdff68a2854405e55924559591df8d0 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Fri, 17 Jul 2009 20:08:54 +0200 Subject: Update French manpage translation --- debian/changelog | 2 + doc/fr/apt.conf.fr.5.xml | 534 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 426 insertions(+), 110 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc88e08cb..6ce3b7c7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.22) UNRELEASED; urgency=low * Documentation translations: - Fix a typo in apt-get(8) French translation. Closes: #525043 Thanks to Guillaume Delacour for spotting it. + - Updated apt.conf(5) manpgae French translation. + Thanks to Aurélien Couderc. * Translations: - fr.po - sk.po. Closes: #525857 diff --git a/doc/fr/apt.conf.fr.5.xml b/doc/fr/apt.conf.fr.5.xml index 88ce46134..f4d8eddb8 100644 --- a/doc/fr/apt.conf.fr.5.xml +++ b/doc/fr/apt.conf.fr.5.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 29 Fvrier 2004 + 11 juillet 2008 @@ -33,26 +33,30 @@ Le fichier apt.conf est le principal fichier de configurati de la collection d'outils que constitue APT ; tous les outils font appel ce fichier de configuration et utilisent un analyseur syntaxique en ligne de commande commun afin de fournir un environnement uniforme. Quand un outil -d'APT dmarre, il lit (si elle existe) la variable d'environnement -APT_CONFIG ; puis il lit les fichiers situs dans +d'APT dmarre, il lit la configuration dsigne par variable d'environnement +APT_CONFIG (si elle existe), puis il lit les fichiers situs dans Dir::Etc::Parts ainsi que le principal fichier de configuration indiqu par Dir::Etc::main ; enfin il applique les options de -la ligne de commande qui annulent les directives de configuration, chargeant, -si ncessaire, d'autres fichiers de configuration. +la ligne de commande qui prvalent sur les directives de configuration, chargeant +si ncessaire d'autres fichiers de configuration. Le fichier de configuration est construit comme un arbre d'options organises en groupes fonctionnels. On se sert du double deux points ( :: ) pour indiquer une option ; par exemple, APT::Get::Assume-Yes est -une option pour le groupe d'outils APT, destine l'outil Get. Les options -n'hritent pas des groupes de leurs parents. +une option pour le groupe d'outils APT, destine l'outil Get. Il n'y a pas d'hritage +des options des groupes parents. Syntaxiquement, le langage de configuration est conu sur le mme modle que les langages utiliss par des outils ISC tels que bind et dhcp. Une ligne -qui commence par // est un commentaire et elle est ignore. +qui commence par // est traite comme un commentaire et ignore, de +mme que les sections de texte places entre /* et +*/, tout comme les commentaires C/C++. Chaque ligne est de la forme : - APT::Get::Assume-Yes "true"; + +APT::Get::Assume-Yes "true"; + Le point-virgule final est obligatoire et les guillemets sont optionnels. On peut dclarer un nouveau champ d'action avec des accolades, comme suit : @@ -68,10 +72,9 @@ APT { -avec des retours la ligne pour faciliter la lecture. On peut crer des -listes en ouvrant un champ d'action et en mettant un seul mot entre -apostrophes suivi d'un point-virgule. On peut mettre plusieurs entres, -spares par un point-virgule. +avec des retours la ligne pour faciliter la lecture. On peut crer une liste +en ouvrant un champ d'action et en y insrant une chane entre guillemets suivie +d'un point virgule pour chaque lment de la liste. @@ -79,14 +82,21 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; -Les modles &docdir;examples/apt.conf &configureindex; +Les modles &docdir;examples/apt.conf et &configureindex; montrent quoi devrait ressembler le fichier de configuration. +Les identifiants des options de configuration ne sont pas sensibles la casse. +Dans l'exemple prcdent, on pourrait donc aussi bien utiliser +dpkg::pre-install-pkgs. + + Deux lments spciaux sont autoriss : #include et -#clear. #include inclut le fichier donn en argument, - moins que le nom ne se termine par une barre oblique. #clear sert -effacer une liste de noms. +#clear. #include inclut le fichier donn en +argument, moins que le nom ne se termine par une barre oblique auquel cas le +rpertoire entier est inclus. #clear sert +effacer une partie de l'arbre de configuration. L'lment dsign et tout ses +descendants sont supprims. Tous les outils d'APT possdent une option qui permet de @@ -95,20 +105,31 @@ syntaxe consiste en un nom complet d'option (par exemple APT::Get::Assume-Yes) suivi par un signe gal, puis par la nouvelle valeur de l'option. On peut complter une liste en ajoutant un  ::  au nom de la liste. - + Le groupe APT - -Ce groupe d'options contrle aussi bien le comportement global d'APT que -la prise en compte des options pour chaque outil. + +Ce groupe d'options contrle le comportement global d'APT et contient galement +des options communes tous les outils. Architecture L'architecture du systme ; cette option positionne l'architecture utiliser -pour rcuprer des fichiers et analyser des listes de paquets. L'architecture -interne par dfaut est celle pour laquelle APT a t compil. +pour rcuprer des fichiers et analyser des listes de paquets. La valeur interne par +dfaut est l'architecture pour laquelle APT a t compil. + + + +Default-Release + +Indique la distribution utiliser par dfaut lors de l'installation d'un +paquet si plusieurs versions sont disponibles. La valeur peut tre un nom de +distribution ou un numro de version. Exemples :  stable , + testing ,  4.0 ,  5.0* . Les noms de codes +des distributions ( etch ,  lenny , etc.) ne sont pas +permis pour l'instant. Voir aussi &apt-preferences;. @@ -123,7 +144,7 @@ dans sa prise de d Clean-Installed Avec cette option qui est active par dfaut, la fonctionnalit  autoclean  -supprime tout paquet qui ne peut plus tre rcupr dans le cache. +supprime du cache tout paquet qui ne peut plus tre rcupr. Quand cette option est dsactive, les paquets qui sont installs localement sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen direct pour les rinstaller. @@ -134,9 +155,9 @@ direct pour les r Dsactive la configuration immdiate ; cette dangereuse option dsactive une partie du code de mise en ordre de APT pour que ce dernier effectue le -moins d'appels possible Dpkg. C'est peut-tre ncessaire sur des systmes -lents un seul utilisateur mais c'est extrmement dangereux et cela peut -faire chouer les scripts d'installation, voire pire. +moins d'appels possible &dpkg;. a peut tre ncessaire sur des systmes + un seul utilisateur extrmement lents, mais cette option est trs dangereuse et +peut faire chouer les scripts d'installation, voire pire. Utilisez-la vos risques et prils. @@ -155,39 +176,37 @@ ou tous les paquets dont ces paquets d Cache-Limit -APT utilise un fichier cache d'une taille mmoire fixe pour ranger les -informations du fichier  available . Cette option fixe la taille -de ce cache. +APT utilise un fichier de cache charg en mmoire avec mmap pour ranger les +informations sur les paquets disponibles. Cette option fixe la taille mmoire +alloue pour le chargement de ce cache. Build-Essential Cette option dfinit les paquets qui sont considrs comme faisant partie -des dpendances essentielles pour la construction des paquets. +des dpendances essentielles pour la construction de paquets. Get La sous-section Get contrle l'outil &apt-get;, -veuillez consulter -sa documentation pour avoir plus d'informations sur les options en question. +veuillez consulter sa documentation pour avoir plus d'informations sur les options +en question. Cache -La sous-section Cache contrle l'outil &apt-cache;, -veuillez -consulter sa documentation pour avoir plus d'informations sur les options en -question. +La sous-section Cache contrle l'outil +&apt-cache;, veuillez consulter sa documentation pour avoir plus d'informations +sur les options en question. CDROM -La sous-section CDROM contrle l'outil&apt-cdrom;, -veuillez -consulter sa documentation pour avoir plus d'informations sur les options en -question. +La sous-section CDROM contrle l'outil +&apt-cdrom;, veuillez consulter sa documentation pour avoir plus d'informations +sur les options en question. @@ -199,13 +218,20 @@ Le groupe d'options Acquire contr les gestionnaires d'URI. +PDiffs +Essayer de tlcharger les fichiers diffrentiels appels +PDiffs pour les paquets ou les fichiers sources, plutt que +de les tlcharger entirement. Par dfaut  true . + + + Queue-Mode -Le mode file d'attente ; Queue-Mode peut prendre une valeur -parmi host ou access et cela dtermine comment APT -paralllise les connexions sortantes. Host signifie qu'une -connexion par cible sera initie, tandis que access signifie qu'une -connexion par type d'URI sera initie. +Le mode de file d'attente ; Queue-Mode peut prendre les +valeurs host ou access et cela dtermine +comment APT paralllise les connexions sortantes. Host signifie +qu'une connexion par cible sera initie, tandis que access signifie +qu'une connexion par type d'URI sera initie. @@ -227,30 +253,32 @@ Par d http -URI HTTP ; http::Proxy est le mandataire (proxy) http utiliser par dfaut. +URI HTTP ; http::Proxy est le mandataire (proxy) HTTP utiliser par dfaut. Il se prsente sous la forme standard : -http://[[user][:pass]@]host[:port]/. En utilisant la syntaxe : -http::Proxy::<host>, o le mot-cl spcial DIRECT -indique de n'utiliser aucun mandataire, on peut spcifier un mandataire -pour chaque machine distante. La variable d'environnement http_proxy -remplace tous ces paramtres. +http://[[user][:pass]@]host[:port]/. On peut spcifier un +mandataire particulier par hte distant en utilisant la syntaxe : +http::Proxy::<hte>. Le mot-cl spcial +DIRECT indique alors de n'utiliser aucun mandataire pour +l'hte. +Lorsqu'elle est dfinie, la variable d'environnement http_proxy +annule et remplace toutes les options de mandataire HTTP. -Trois options de configuration sont fournies pour le contrle des caches qui -sont compatibles avec HTTP/1.1. No-Cache signifie que le mandataire -ne doit pas du tout utiliser les rponses qu'il a stockes ; Max-Age +Trois options de configuration sont fournies pour le contrle des caches compatibles +avec HTTP/1.1. No-Cache signifie que le mandataire ne doit jamais +utiliser les rponses qu'il a stockes ; Max-Age sert uniquement pour les fichiers d'index : cela demande au cache de les mettre jour quand leur anciennet est suprieure au nombre de secondes -donn. Debian met jour son fichier d'index de manire journalire, la +donn. Debian met jour ses fichiers d'index de manire quotidienne ; la valeur par dfaut est donc de 1 jour. No-Store sert uniquement -pour les fichiers d'archive : cela demande au cache de ne jamais garder +pour les fichiers d'archive  et demande au cache de ne jamais garder la requte. Cela peut viter de polluer un cache mandataire avec des fichiers .deb trs grands. Note : Squid 2.0.2 ne prend en compte aucune de ces options. L'option timeout positionne le compteur de temps mort (timeout) -utilis par la mthode : cela vaut pour tout (connexion, donnes). +utilis par la mthode. Cela vaut pour tout, connexion et donnes. Une option de configuration est fournie pour contrler la profondeur du tube @@ -264,27 +292,62 @@ ne respectent pas la RFC 2068. +https + +URI HTTPS. Les options de contrle de cache et de mandataire (proxy) sont les +mmes que pour la mthode http. L'option +Pipeline-Depth n'est pas encore supporte. + + +La sous-option CaInfo spcifie le fichier contenant +les informations sur les certificats de confiance. +La sous-option boolenne Verify-Peer prcise si le +certificat d'hte du serveur doit tre confront aux certificats de confiance +ou pas. La sous-option boolenne Verify-Host prcise s'il +faut vrifier ou pas le nom d'hte du serveur. SslCert +dtermine le certificat utiliser pour l'authentification du client. +SslKey dtermine quelle clef prive doit tre utilise pour +l'authentification du client. SslForceVersion surcharge la +valeur par dfaut pour la version de SSL utiliser et peut contenir l'une des +chanes 'TLSv1' ou 'SSLv3'. + +Chacune de ces options peut tre spcifie pour un hte particulier en +utilisant <hte>::CaInfo, +<hte>::Verify-Peer, +<hte>::Verify-Host, +<hte>::SslCert, +<hte>::SslKey et +<hte>::SslForceVersion respectivement. + + + ftp -URI FTP ; ftp::Proxy est le serveur mandataire par dfaut utiliser. Il se -prsente sous la forme standard : -ftp://[[user][:pass]@]host[:port]/ ; il est remplac par la -variable d'environnement ftp_proxy. Pour utiliser un mandataire ftp, -vous devez renseigner l'entre ftp::ProxyLogin dans le fichier de -configuration. Cette entre spcifie les commandes qui disent au serveur -mandataire comment se connecter. Voyez &configureindex; pour savoir -comment faire. Les variables de substitution disponibles sont : -$(PROXY_USER), $(PROXY_PASS), $(SITE_USER), -$(SITE_PASS), $(SITE), et $(SITE_PORT). -Chacune correspond un lment de l'URI. +URI FTP ; ftp::Proxy est le mandataire (proxy) FTP utiliser par dfaut. +Il se prsente sous la forme standard : +ftp://[[user][:pass]@]host[:port]/. On peut spcifier un +mandataire particulier par hte distant en utilisant la syntaxe : +ftp::Proxy::<hte>. Le mot-cl spcial +DIRECT indique alors de n'utiliser aucun mandataire pour +l'hte. Lorsqu'elle est dfinie, la variable d'environnement +ftp_proxy annule et replace toutes les options de mandataire +FTP. Pour utiliser un mandataire FTP, vous devrez renseigner l'entre +ftp::ProxyLogin dans le fichier de configuration. Cette +entre spcifie les commandes envoyer au mandataire pour lui prciser quoi +il doit se connecter. Voyez &configureindex; pour savoir comment faire. Les +variables de substitution disponibles sont : +$(PROXY_USER), $(PROXY_PASS), +$(SITE_USER), $(SITE_PASS), +$(SITE) et $(SITE_PORT). Chacune +correspond l'lment respectif de l'URI. -L'option timeout positionne le compteur de temps mort (timeout) -utilis par la mthode : cela vaut pour tout (connexion, donnes). +L'option timeout positionne le compteur de temps mort +(timeout) utilis par la mthode. Cela vaut pour tout, connexion et donnes. Plusieurs options de configuration sont fournies pour contrler le mode -passif. Gnralement, c'est plus sr d'activer le mode passif ; cela +passif. Il est gnralement plus sr d'activer le mode passif et cela marche dans presque tous les environnements. Cependant, certaines situations ncessitent que le mode passif soit dsactiv et que le mode  port  de ftp @@ -293,16 +356,18 @@ connexions qui passent par un mandataire ou pour une machine spcifique (examinez le modle de fichier de configuration). -On peut utiliser un mandataire FTP pour atteindre une cible HTTP en -positionnant la variable d'environnement ftp_proxy une url http -- -consultez la mthode http ci-dessus pour la syntaxe. On ne peut pas fixer -cette variable dans le fichier de configuration et il n'est pas recommand -d'utiliser HTTP par FTP cause de son peu d'efficacit. +Il est possible de faire transiter le trafic FTP par un mandataire HTTP en +positionnant la variable d'environnement ftp_proxy une URL +HTTP -- +consultez la mthode http ci-dessus pour la syntaxe. On ne peut pas le faire +dans le fichier de configuration et il n'est de toute faon pas recommand +d'utiliser FTP au travers de HTTP en raison la faible efficacit de cette +mthode. L'option ForceExtended contrle l'utilisation des commandes lies la RFC 2428, EPSV et EPRT. Par dfaut, elle vaut - false  ; ce qui signifie que ces commandes ne sont + false  ce qui signifie que ces commandes ne sont utilises que pour une connexion de type IPv6. Quand elle vaut  true , on les utilise mme si la connexion est de type IPv4. La plupart des serveurs FTP ne suivent pas la RFC 2428. @@ -311,7 +376,7 @@ plupart des serveurs FTP ne suivent pas la RFC 2428. cdrom -URI CDROM ; la seule option de configuration pour les URI de CDROM +URI cdrom ; la seule option de configuration pour les URI de cdrom est le point de montage : cdrom::Mount ; il doit reprsenter le point de montage du lecteur de cdrom indiqu dans /etc/fstab. @@ -326,9 +391,9 @@ peuvent gpgv -URI GPGV ; la seule option pour les URI GPGV est celle qui permet de +URI GPGV ; la seule option pour les URI GPGV est celle qui permet de passer des paramtres gpgv. - gpgv::Options Options supplmentaires passes + gpgv::Options : options supplmentaires passes gpgv. @@ -341,7 +406,8 @@ URI GPGV ; la seule option pour les URI GPGV est celle qui permet de Les rpertoires de la section Dir::State concernent le systme local. lists est le rpertoire o placer les listes de paquets -tlchargs et status est le nom du fichier d'tat de Dpkg. +tlchargs et status est le nom du fichier d'tat de +&dpkg;. preferences concerne APT : c'est le nom du fichier des prfrences. Dir::State contient le rpertoire par dfaut prfix tous les @@ -353,8 +419,8 @@ ou ./. cache local : par exemple, les deux caches de paquets srcpkgcache et pkgcache, et aussi l'endroit o sont places les archives tlcharges, Dir::Cache::archives. On peut -empcher la cration des caches en laissant leur nom en blanc. Cela ralentit -le dmarrage mais cela sauve de l'espace disque. Il vaut mieux se passer du +empcher la cration des caches en saisissant un nom vide. Cela ralentit +le dmarrage mais sauve de l'espace disque. Il vaut mieux se passer du cache pkgcache plutt que se passer du cache srcpkgcache. Comme pour Dir::State, le rpertoire par dfaut est contenu dans Dir::Cache. @@ -375,11 +441,22 @@ de configuration est charg Les programmes binaires sont points par Dir::Bin. L'emplacement des gestionnaires de mthodes est indiqu par Dir::Bin::Methods ; gzip, -Dpkg, apt-get, +dpkg, apt-get, dpkg-source, dpkg-buildpackage et apt-cache indiquent l'emplacement des programmes correspondants. - + + +L'option de configuration RootDir a une signification +particulire. Lorsqu'elle est dfinie, tous les chemins dclars dans +Dir:: sont considrs relativement +RootDir, mme les chemins spcifis de manire +absolue. Ainsi par exemple si RootDir est +dfini comme /tmp/staging, et que chemin du fichier d'tat +Dir::State::status est dclar comme +/var/lib/dpkg/status alors ce fichier sera cherch +dans /tmp/staging/var/lib/dpkg/status. + APT et DSelect @@ -406,14 +483,14 @@ de nouveaux paquets. Options -Le contenu de cette variable est pass &apt-get; avec les options de la ligne -de commande quand ce programme est utilis dans la phase d'installation. +Le contenu de cette variable est pass comme options de ligne de commande +&apt-get; lors de la phase d'installation. UpdateOptions -Le contenu de cette variable est pass &apt-get; avec les options de la -ligne de commande quand ce programme est utilis dans la phase de mise jour. +Le contenu de cette variable est pass comme options de ligne de commande +&apt-get; lors de la phase de mise jour. @@ -427,7 +504,7 @@ qu'en cas d'erreur que l'on propose -Comment APT appelle Dpkg +Comment APT appelle &dpkg; Plusieurs directives de configuration contrlent la manire dont APT invoque &dpkg; : elles figurent dans la section DPkg. @@ -435,8 +512,8 @@ invoque &dpkg; : elles figurent dans la section DPkg. Options -Il s'agit d'une liste d'options passer dpkg. Les options doivent tre -dclares en utilisant la notation de liste et chaque lment de liste est +Il s'agit d'une liste d'options passer &dpkg;. Les options doivent tre +dclares en utilisant la notation de liste et chaque lment de la liste est pass comme un seul argument &dpkg;. @@ -450,7 +527,7 @@ liste. Les commandes sont appel Pre-Install-Pkgs -Il s'agit d'une liste de commandes shell excuter avant d'appeler Dpkg. +Il s'agit d'une liste de commandes shell excuter avant d'appeler &dpkg;. Tout comme pour Options, on doit utiliser la notation de liste. Les commandes sont appeles dans l'ordre, en utilisant /bin/sh : APT s'arrte ds que l'une d'elles choue. Sur @@ -467,7 +544,7 @@ commande pass Run-Directory -APT se place dans ce rpertoire avant d'appeler Dpkg ; par dfaut c'est +APT se place dans ce rpertoire avant d'appeler &dpkg; ; par dfaut c'est le rpertoire /. @@ -481,25 +558,262 @@ cr + +Options  Periodic  et  Archive  + +Les groupes d'options APT::Periodic et +APT::Archive configurent les comportements priodiques +raliss par le script /etc/cron.daily/apt, lanc +quotidiennement. + + +APT::Periodic +Les options de cette section permettent de configurer la frquence +d'excution des tches APT lances automatiquement. Ces paramtre prennent +comme valeurs des priodicits d'excution en nombre de jours. + + +Update-Package-List : priodicit de mise jour de la +liste des paquets disponibles. (0 = dsactiv) + + +Download-Upgradable-Packages : priodicit de +tlchargement dans le cache des paquets pour lesquels une mise jour est +disponible. (0 = dsactiv) + + +AutocleanInterval : priodicit des + autoclean , c'est dire de la suppression du cache des paquets +qui ne peuvent plus tre tlchargs. (0 = dsactiv) + + +Unattended-Upgrade : priodicit de mise jour +automatique du systme sans intervention humaine. Le paquet +unattended-upgrades doit tre install pour que cette tche +s'excute. Le cas chant un fichier journal est crit dans +/var/log/unattended-upgrades. (0 = dsactiv) + + +APT::Archive +Les options de la section APT::Archive permettent de contrler la taille +du cache de paquets. + + +MaxAge : anciennet maximale d'un paquet dans le cache, +en nombre de jours. Les paquets plus anciens sont supprims. (0 = dsactiv) + + +MaxSize : taille maximale du cache en Mo. (0 = +dsactive) Si ce maximum est dpass, des paquets sont supprims jusqu' ce +que la taille du cache repasse sous la limite. Les paquets les plus volumineux +sont supprims en premier. + + +MinAge : age minimum d'un paquet du cache, en nombre de +jours (0 = dsactiv). Un paquet plus rcent ne sera pas supprim. Cette option +est utile pour garder disposition une version des paquets en cas de problme +grave. + + + + + Les options de dbogage - -La plupart des options de la section debug n'ont aucun intrt -pour le simple utilisateur ; cependant, -Debug::pkgProblemResolver affiche d'intressantes informations sur -les dcisions que prend la commande dist-upgrade. Debug::NoLocking -dsactive le verrouillage de fichier de manire ce que APT puisse effectuer -quelques oprations sans tre  root  et -Debug::pkgDPkgPM affiche la ligne de commande chaque appel de -Dpkg. Debug::IdentCdrom dsactive l'inclusion de -donnes de type statfs dans les ID de CDROM. -Debug::Acquire::gpgv Dbogage de la mthode gpgv. - + +Les options de la section Debug:: servent soit provoquer +l'affichage d'informations de dbogage sur la sortie d'erreur standard du +programme qui utilise les librairies APT, soit activer des modes de +fonctionnement spciaux qui sont principalement utiles pour dboguer le +comportement de APT. La plupart de ces options n'ont pas +d'intrt pour un utilisateur normal, mais certaines peuvent tout de mme tre +utiles : + + + +Debug::pkgProblemResolver affiche d'intressantes +informations sur les dcisions prises par les commandes dist-upgrade, +upgrade, install, remove et purge. + + +Debug::NoLocking dsactive le verrouillage de fichier de +manire ce que APT puisse effectuer quelques oprations (telles que +apt-get -s install) sans tre  root . + + +Debug::pkgDPkgPM affiche la ligne de commande chaque appel +de &dpkg;. + + +Debug::IdentCdrom dsactive l'inclusion de donnes de type +statfs dans les ID de cdrom. + + + +Voici une liste complte des options de dbogage de APT. + +Debug::Acquire::cdrom + +Affiche les informations concernant les sources de type cdrom:// + + +Debug::Acquire::ftp + +Affiche les informations concernant le tlchargement de paquets par FTP. + + +Debug::Acquire::http + +Affiche les informations concernant le tlchargement de paquets par HTTP. + + +Debug::Acquire::https + +Affiche les informations concernant le tlchargement de paquets par HTTPS. + + +Debug::Acquire::gpgv + +Affiche les informations relatives la vrification de signatures +cryptographiques avec gpg. + + +Debug::aptcdrom + +Affiche des informations concernant l'accs aux collections de paquets +stockes sur cdrom. + + +Debug::BuildDeps + +Dcrit le processus de rsolution des dpendances pour la construction de +paquets source (  build-dependencies  ) par &apt-get;. + + +Debug::Hashes + +Affiche toutes les clefs de hachage cryptographiques gnres par les +librairies APT. + + +Debug::IdentCdrom +Dsactive l'inclusion des donnes de type +statfs pour la gnration des ID de cdrom, savoir le +nombre de blocs libres et utiliss sur le systme de fichier du cdrom. + + +Debug::NoLocking + +Dsactive le verrouillage de fichiers. Cela permet par exemple de lancer deux +instances de  apt-get update  en mme temps. + + +Debug::pkgAcquire + +Trace les ajouts et suppressions d'lments de la queue globale de +tlchargement. + + +Debug::pkgAcquire::Auth + +Affiche les dtails de la vrification des sommes de contrle et des signatures +cryptographiques des fichiers tlchargs, ainsi que les erreurs ventuelles. + + +Debug::pkgAcquire::Diffs + +Affiche les informations de tlchargement et de prise en compte des fichiers +diffrentiels des indexes de paquets, ainsi que les erreurs ventuelles. + + +Debug::pkgAcquire::RRed + +Affiche les dtails de la vrification des sommes de contrle et des signatures +cryptographiques des fichiers tlchargs, ainsi que les erreurs ventuelles. + + +Debug::pkgAcquire::Worker + +Affiche toutes les interactions avec les processus enfants qui se chargent +effectivement des tlchargements. + + +Debug::pkgAcquire::pkgAutoRemove + +Affiche les changements concernant le marquage des paquets comme installs +automatiquement, et la suppression des paquets inutiles. + + +Debug::pkgDepCache::AutoInstall + +Gnre les informations de dbogage dcrivant quels paquets sont installs +automatiquement pour satisfaire les dpendances. Cela concerne la passe +initiale d'installation automatique effectue par exemple par +apt-get install et pas le systme de rsolution de +dpendances complet de APT ; voir +Debug::pkgProblemResolver pour ce dernier. + + +Debug::pkgInitConfig + +Au lancement, affiche l'ensemble de la configuration sur la sortie d'erreur +standard. + + +Debug::pkgDPkgPM + +Affiche la commande exacte d'invocation de &dpkg; chaque appel ; les +arguments sont spars par des espaces. + + +Debug::pkgDPkgProgressReporting + Affiche l'ensemble des informations reues de &dpkg; par +l'intermdiaire du descripteur de fichier d'tat, et les ventuelles erreurs +d'analyse de ce fichier. + + +Debug::pkgOrderList + +Affiche les tapes de l'algorithme utilis pour choisir l'ordre dans lequel APT +passe les paquets &dpkg;. + + +Debug::pkgPackageManager + +Affiche le dtail des oprations lies l'invocation de &dpkg;. + + +Debug::pkgPolicy + +Au lancement, affiche la priorit de chaque liste de paquets. + + +Debug::pkgProblemResolver + +Affiche la trace d'excution du systme de rsolution de dpendances (ne +concerne que les cas o un problme de dpendances complexe se prsente). + + +Debug::sourceList + +Affiche les fournisseurs dclars dans le fichier +/etc/apt/vendors.list. + + + + + Exemples -Le fichier &configureindex; contient un modle de fichier montrant les valeurs par -dfaut de toutes les options possibles. +Le fichier &configureindex; contient un modle de fichier montrant des exemples +pour toutes les options existantes. @@ -514,4 +828,4 @@ d &manbugs; &deux-traducteurs; - \ No newline at end of file + -- cgit v1.2.3-70-g09d2 From 4b7cfe96d621ab8fc0cec1334f0cd5f9ea87bf6d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Jul 2009 13:52:48 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - provide DPkg::Chroot-Directory config option (useful for testing) --- apt-pkg/deb/dpkgpm.cc | 9 +++++++++ debian/changelog | 2 ++ 2 files changed, 11 insertions(+) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 416860f35..f787f365e 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -866,6 +866,15 @@ bool pkgDPkgPM::Go(int OutStatusFd) } close(fd[0]); // close the read end of the pipe + if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") + { + std::cerr << "Chrooting into " + << _config->FindDir("DPkg::Chroot-Directory") + << std::endl; + if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0) + _exit(100); + } + if (chdir(_config->FindDir("DPkg::Run-Directory","/").c_str()) != 0) _exit(100); diff --git a/debian/changelog b/debian/changelog index 65fd9e590..cf9231105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.21) UNRELEASED; urgency=low * methods/http.cc: - ignore SIGPIPE, we deal with EPIPE from write in HttpMethod::ServerDie() (LP: #385144) + * apt-pkg/deb/dpkgpm.cc: + - provide DPkg::Chroot-Directory config option (useful for testing) -- Michael Vogt Thu, 28 May 2009 17:51:42 +0200 -- cgit v1.2.3-70-g09d2 From c98870b05a2bd121986e36851b54566285603fe6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Jul 2009 16:53:42 +0200 Subject: debian/apt.cron.daily: cleanups in the cron script --- debian/apt.cron.daily | 310 +++++++++++++++++++++++--------------------------- 1 file changed, 141 insertions(+), 169 deletions(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index cdec7eea0..8c2bd22d9 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -75,7 +75,6 @@ check_stamp() fi if [ ! -f $stamp ]; then - update_stamp $stamp debug_echo "check_stamp: missing time stamp file: $stamp." # treat as enough time has passed return 0 @@ -105,18 +104,25 @@ update_stamp() # we check here if autoclean was enough sizewise check_size_constraints() { - # min-age in days MaxAge=0 - MinAge=2 - MaxSize=0 - CacheDir="var/cache/apt" - CacheArchive="archives/" eval $(apt-config shell MaxAge APT::Archives::MaxAge) + eval $(apt-config shell MaxAge APT::Periodic::MaxAge) + + MinAge=2 eval $(apt-config shell MinAge APT::Archives::MinAge) + eval $(apt-config shell MinAge APT::Periodic::MinAge) + + MaxSize=0 eval $(apt-config shell MaxSize APT::Archives::MaxSize) - eval $(apt-config shell Dir Dir) + eval $(apt-config shell MaxSize APT::Periodic::MaxSize) + + CacheDir="var/cache/apt/" eval $(apt-config shell CacheDir Dir::Cache) + CacheDir=${CacheDir%/} + + CacheArchive="archives/" eval $(apt-config shell CacheArchive Dir::Cache::archives) + CacheArchive=${CacheArchive%/} # sanity check if [ -z "$CacheDir" -o -z "$CacheArchive" ]; then @@ -128,9 +134,13 @@ check_size_constraints() # check age if [ ! $MaxAge -eq 0 ] && [ ! $MinAge -eq 0 ]; then + debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f elif [ ! $MaxAge -eq 0 ]; then + debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f + else + debug_echo "skip aging since MaxAge is 0" fi # check size @@ -148,11 +158,12 @@ check_size_constraints() size=${du%%/*} # check if the cache is small enough if [ $size -lt $MaxSize ]; then + debug_echo "end remove by archive size: size=$size < $MaxSize" break fi # check for MinAge of the file - if [ ! $MinAge -eq 0 ]; then + if [ $MinAge -ne 0 ]; then # check both ctime and mtime mtime=$(stat -c %Y $file) ctime=$(stat -c %Z $file) @@ -161,19 +172,94 @@ check_size_constraints() else delta=$(($now-$ctime)) fi - #echo "$file ($delta), $MinAge" if [ $delta -le $MinAge ]; then - #echo "Skiping $file (delta=$delta)" + debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec" break + else + # delete oldest file + debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize" + rm -f $file fi fi - - # delete oldest file - rm -f $file done fi } +# deal with the Apt::Periodic::BackupArchiveInterval +do_cache_backup() +{ + BackupArchiveInterval="$1" + if [ $BackupArchiveInterval -eq 0 ]; then + return + fi + + # Set default values and normalize + Dir="/" + eval $(apt-config shell Dir Dir) + Dir=${Dir%/} + + CacheDir="var/cache/apt/" + eval $(apt-config shell CacheDir Dir::Cache) + CacheDir=${CacheDir%/} + if [ -z "$CacheDir" ]; then + debug_echo "practically empty Dir::Cache, exiting" + return 0 + fi + + CacheArchive="archives/" + eval $(apt-config shell CacheArchive Dir::Cache::Archives) + CacheArchive=${CacheArchive%/} + if [ -z "$CacheArchive" ]; then + debug_echo "practically empty Dir::Cache::archives, exiting" + return 0 + fi + + BackupLevel=3 + eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) + if [ $BackupLevel -le 1 ]; then + BackupLevel=2 ; + fi + + CacheBackup="backup/" + eval $(apt-config shell CacheBackup Dir::Cache::Backup) + CacheBackup=${CacheBackup%/} + if [ -z "$CacheBackup" ]; then + echo "practically empty Dir::Cache::Backup, exiting" 1>&2 + return + fi + + Cache="${Dir}/${CacheDir}/${CacheArchive}/" + Back="${Dir}/${CacheDir}/${CacheBackup}/" + BackX="${Back}${CacheArchive}/" + for x in $(seq 0 1 $((${BackupLevel}-1))); do + eval "Back${x}=${Back}${x}/" + done + + # backup after n-days if archive contents changed. + # (This uses hardlink to save disk space) + BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp + if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then + if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then + mkdir -p $Back + rm -rf $Back$((${BackupLevel}-1)) + for y in $(seq $((${BackupLevel}-1)) -1 1); do + eval BackY=${Back}$y + eval BackZ=${Back}$(($y-1)) + if [ -e $BackZ ]; then + mv -f $BackZ $BackY ; + fi + done + cp -la $Cache $Back ; mv -f $BackX $Back0 + update_stamp $BACKUP_ARCHIVE_STAMP + debug_echo "backup with hardlinks. (success)" + else + debug_echo "skip backup since same content." + fi + else + debug_echo "skip backup since too new." + fi +} + # sleep for a random interval of time (default 30min) # (some code taken from cron-apt, thanks) random_sleep() @@ -188,6 +274,7 @@ random_sleep() RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5") fi TIME=$(($RANDOM % $RandomSleep)) + debug_echo "sleeping for $TIME seconds" sleep $TIME } @@ -200,7 +287,7 @@ debug_echo() fi } -# main +# ------------------------ main ---------------------------- # check apt-config exstance if ! which apt-config >/dev/null ; then @@ -209,6 +296,7 @@ fi # Set VERBOSE mode from apt-config (or inherit from environment) eval $(apt-config shell VERBOSE APT::Periodic::Verbose) +debug_echo "verbose level $VERBOSE" if [ -z "$VERBOSE" ]; then VERBOSE="0" fi @@ -238,11 +326,10 @@ if which on_ac_power >/dev/null; then on_ac_power POWER=$? if [ $POWER -eq 1 ]; then - debug_echo "exit: system on main power." + debug_echo "exit: system NOT on main power" exit 0 elif [ $POWER -ne 0 ]; then - debug_echo "exit: power status ($POWER) undetermined." - exit 0 + debug_echo "power status ($POWER) undetermined, continuing" fi debug_echo "system is on main power." fi @@ -252,60 +339,12 @@ if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then debug_echo "error encountered in cron job with \"apt-get check\"." exit 0 fi -# No need to check for apt-get below # Global current time in seconds since 1970-01-01 00:00:00 UTC now=$(date +%s) -# Set default values and normalize -Dir="/" -eval $(apt-config shell Dir Dir) -Dir=${Dir%/} - -CacheDir="var/cache/apt/" -eval $(apt-config shell CacheDir Dir::Cache) -CacheDir=${CacheDir%/} -if [ -z "$CacheDir" ]; then - debug_echo "practically empty Dir::Cache, exiting" - exit 0 -fi - -CacheArchive="archives/" -eval $(apt-config shell CacheArchive Dir::Cache::Archives) -CacheArchive=${CacheArchive%/} -if [ -z "$CacheArchive" ]; then - debug_echo "practically empty Dir::Cache::archives, exiting" - exit 0 -fi - -BackupArchiveInterval=0 -eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) - -BackupLevel=3 -eval $(apt-config shell BackupLevel APT::Periodic::BackupLevel) -if [ $BackupLevel -le 1 ]; then BackupLevel=2 ; fi - -CacheBackup="backup/" -eval $(apt-config shell CacheBackup Dir::Cache::Backup) -CacheBackup=${CacheBackup%/} -if [ -z "$CacheBackup" ]; then - echo "practically empty Dir::Cache::Backup, exiting" 1>&2 - exit 0 -fi - # Support old Archive for compatibility. # Document only Periodic for all controling parameters of this script. -MaxAge=0 -eval $(apt-config shell MaxAge APT::Archives::MaxAge) -eval $(apt-config shell MaxAge APT::Periodic::MaxAge) - -MinAge=2 -eval $(apt-config shell MinAge APT::Archives::MinAge) -eval $(apt-config shell MinAge APT::Periodic::MinAge) - -MaxSize=0 -eval $(apt-config shell MaxSize APT::Archives::MaxSize) -eval $(apt-config shell MaxSize APT::Periodic::MaxSize) UpdateInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists) @@ -319,12 +358,8 @@ eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgr AutocleanInterval=0 eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) -Cache="${Dir}/${CacheDir}/${CacheArchive}/" -Back="${Dir}/${CacheDir}/${CacheBackup}/" -BackX="${Back}${CacheArchive}/" -for x in $(seq 0 1 $((${BackupLevel}-1))); do - eval "Back${x}=${Back}${x}/" -done +BackupArchiveInterval=0 +eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) # check if we actually have to do anything if [ $UpdateInterval -eq 0 ] && @@ -335,77 +370,12 @@ if [ $UpdateInterval -eq 0 ] && exit 0 fi +# deal with BackupArchiveInterval +do_cache_backup $BackupArchiveInterval -# backup after n-days if archive contents changed. -# (This uses hardlink to save disk space) -BACKUP_ARCHIVE_STAMP=/var/lib/apt/periodic/backup-archive-stamp -if check_stamp $BACKUP_ARCHIVE_STAMP $BackupArchiveInterval; then - if [ $({(cd $Cache 2>/dev/null; find . -name "*.deb"); (cd $Back0 2>/dev/null;find . -name "*.deb") ;}| sort|uniq -u|wc -l) -ne 0 ]; then - mkdir -p $Back - rm -rf $Back$((${BackupLevel}-1)) - for y in $(seq $((${BackupLevel}-1)) -1 1); do - eval BackY=${Back}$y - eval BackZ=${Back}$(($y-1)) - if [ -e $BackZ ]; then mv -f $BackZ $BackY ; fi - done - cp -la $Cache $Back ; mv -f $BackX $Back0 - update_stamp $BACKUP_ARCHIVE_STAMP - debug_echo "backup with hardlinks. (success)" - else - - debug_echo "skip backup since same content." - fi -else - debug_echo "skip backup since too new." -fi - -# package archive contnts removal by package age -if [ $MaxAge -ne 0 ] && [ $MinAge -ne 0 ]; then - find $Cache -name "*.deb" \( -mtime +$MaxAge -and -ctime +$MaxAge \) -and -not \( -mtime -$MinAge -or -ctime -$MinAge \) -print0 | xargs -r -0 rm -f - debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge and ctime>$MinAge and mtime>$MinAge" -elif [ $MaxAge -ne 0 ]; then - find $Cache -name "*.deb" -ctime +$MaxAge -and -mtime +$MaxAge -print0 | xargs -r -0 rm -f - debug_echo "aged: ctime <$MaxAge and mtime <$MaxAge only" -else - debug_echo "skip aging since MaxAge is 0" -fi - -# package archive contnts removal down to $MaxSize -if [ $MaxSize -ne 0 ]; then - - MinAgeSec=$(($MinAge*24*60*60)) - - # reverse-sort by mtime - for file in $(ls -rt $Cache/*.deb 2>/dev/null); do - du=$(du -m -s $Cache) - size=${du%%/*} - # check if the cache is small enough - if [ $size -lt $MaxSize ]; then - debug_echo "end remove by archive size: size=$size < $MaxSize" - break - fi - - # check for MinAge in second of the file - if [ $MinAgeSec -ne 0 ]; then - # check both ctime and mtime - mtime=$(stat -c %Y $file) - ctime=$(stat -c %Z $file) - if [ $mtime -gt $ctime ]; then - delta=$(($now-$mtime)) - else - delta=$(($now-$ctime)) - fi - if [ $delta -le $MinAgeSec ]; then - debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec" - else - # delete oldest file - debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize" - rm -f $file - fi - fi - - done -fi +# sleep random amount of time to avoid hitting the +# mirrors at the same time +random_sleep # update package lists UPDATE_STAMP=/var/lib/apt/periodic/update-stamp @@ -422,48 +392,50 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then debug_echo "dbus signal not send (command not available)" fi update_stamp $UPDATE_STAMP - # download all upgradeable packages if it is requested - DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp - if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then - if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then - update_stamp $DOWNLOAD_UPGRADEABLE_STAMP - debug_echo "download upgradable (success)." - # auto upgrade all upgradeable packages - UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp - if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then - if unattended-upgrade $XUUPOPT; then - update_stamp $UPGRADE_STAMP - debug_echo "unattended-upgrade (success)." - else - debug_echo "unattended-upgrade (error)." - fi - else - debug_echo "unattended-upgrade (not run)." - fi - else - debug_echo "download upgradable (error)." - fi - else - debug_echo "download upgradable (not run)." - fi else - debug_echo "download updated metadata (error)." + debug_echo "download updated metadata (error)" fi else debug_echo "download updated metadata (not run)." fi + +# download all upgradeable packages (if it is requested) +DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp +if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then + if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then + update_stamp $DOWNLOAD_UPGRADEABLE_STAMP + debug_echo "download upgradable (success)" + else + debug_echo "download upgradable (error)" + fi +else + debug_echo "download upgradable (not run)" +fi + +# auto upgrade all upgradeable packages +UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp +if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + if unattended-upgrade $XUUPOPT; then + update_stamp $UPGRADE_STAMP + debug_echo "unattended-upgrade (success)" + else + debug_echo "unattended-upgrade (error)" + fi +else + debug_echo "unattended-upgrade (not run)" +fi # autoclean package archive AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then - if apt-get $XAPTOPT -y autoclean $XSTDERR; then + if eval apt-get $XAPTOPT -y autoclean $XSTDERR; then debug_echo "autoclean (success)." update_stamp $AUTOCLEAN_STAMP else - debug_echo "autoclean (error)." + debug_echo "autoclean (error)" fi else - debug_echo "autoclean (not run)." + debug_echo "autoclean (not run)" fi # -- cgit v1.2.3-70-g09d2 From c5f44afc2446d738e30ea4c6021d4b60915546b1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 21 Jul 2009 16:54:28 +0200 Subject: eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc which can arise if cache doesn't fit into the mmap (Closes: #535218) This removes also the previously introduced SegfaultSignalHandler: The handler works, but is ugly by design... --- apt-pkg/contrib/mmap.cc | 68 +++++++++++++++++-------------------------------- apt-pkg/pkgcachegen.cc | 45 +++++++++++++++++--------------- debian/changelog | 4 +-- 3 files changed, 50 insertions(+), 67 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index 5f56178f4..ba4482131 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -19,7 +19,6 @@ #define _BSD_SOURCE #include #include -#include #include @@ -28,7 +27,6 @@ #include #include #include -#include #include /*}}}*/ @@ -139,24 +137,11 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) } /*}}}*/ -// DynamicMMapSegfaultHandler /*{{{*/ -// --------------------------------------------------------------------- -/* In theory, the mmap should never segfault because we check the available - size of our mmap before we use it, but there are a few reports out there - which state that the mmap segfaults without further notice. So this handler - will take care of all these segfaults which should never happen... */ -void DynamicMMapSegfaultHandler(int) -{ - _error->Error(_("Dynamic MMap segfaults, most likely because it ran out of room. " - "Please increase the size of APT::Cache-Limit. (man 5 apt.conf)")); - _error->DumpErrors(); - exit(EXIT_FAILURE); -} /*}}}*/ // DynamicMMap::DynamicMMap - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : +DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace) { if (_error->PendingError() == true) @@ -187,13 +172,6 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) : if (_error->PendingError() == true) return; - if (_config->FindB("MMap::SegfaultHandler",true) == true) - { - struct sigaction sa; - sa.sa_handler = DynamicMMapSegfaultHandler; - sigaction(SIGSEGV, &sa, NULL); - } - #ifdef _POSIX_MAPPED_FILES // use anonymous mmap() to get the memory Base = (unsigned char*) mmap(0, WorkSpace, PROT_READ|PROT_WRITE, @@ -237,9 +215,9 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) unsigned long Result = iSize; if (Aln != 0) Result += Aln - (iSize%Aln); - + iSize = Result + Size; - + // try to grow the buffer while(Result + Size > WorkSpace) { @@ -258,7 +236,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln) /* This allocates an Item of size ItemSize so that it is aligned to its size in the file. */ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) -{ +{ // Look for a matching pool entry Pool *I; Pool *Empty = 0; @@ -283,17 +261,24 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) I->ItemSize = ItemSize; I->Count = 0; } - + + unsigned long Result = 0; // Out of space, allocate some more if (I->Count == 0) { - I->Count = 20*1024/ItemSize; - I->Start = RawAllocate(I->Count*ItemSize,ItemSize); - } + const unsigned long size = 20*1024; + I->Count = size/ItemSize; + Result = RawAllocate(size,ItemSize); + // Does the allocation failed ? + if (Result == 0 && _error->PendingError()) + return 0; + I->Start = Result; + } + else + Result = I->Start; I->Count--; - unsigned long Result = I->Start; - I->Start += ItemSize; + I->Start += ItemSize; return Result/ItemSize; } /*}}}*/ @@ -303,21 +288,14 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize) unsigned long DynamicMMap::WriteString(const char *String, unsigned long Len) { - unsigned long Result = iSize; - // try to grow the buffer - while(Result + Len > WorkSpace) - { - if(!Grow()) - { - _error->Error(_("Dynamic MMap ran out of room. Please increase the size " - "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace); - return 0; - } - } - if (Len == (unsigned long)-1) Len = strlen(String); - iSize += Len + 1; + + unsigned long Result = RawAllocate(Len+1,0); + + if (Result == 0 && _error->PendingError()) + return 0; + memcpy((char *)Base + Result,String,Len); ((char *)Base)[Result + Len] = 0; return Result; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 7833d6476..e2934d1fa 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -53,14 +53,16 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) : { // Setup the map interface.. Cache.HeaderP = (pkgCache::Header *)Map.Data(); - Map.RawAllocate(sizeof(pkgCache::Header)); + if (Map.RawAllocate(sizeof(pkgCache::Header)) == 0 && _error->PendingError() == true) + return; + Map.UsePools(*Cache.HeaderP->Pools,sizeof(Cache.HeaderP->Pools)/sizeof(Cache.HeaderP->Pools[0])); - + // Starting header *Cache.HeaderP = pkgCache::Header(); Cache.HeaderP->VerSysName = Map.WriteString(_system->VS->Label); Cache.HeaderP->Architecture = Map.WriteString(_config->Find("APT::Architecture")); - Cache.ReMap(); + Cache.ReMap(); } else { @@ -135,7 +137,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, pkgCache::VerIterator Ver = Pkg.VersionList(); map_ptrloc *LastVer = &Pkg->VersionList; - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + for (; Ver != 0 && Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { pkgCache::DescIterator Desc = Ver.DescriptionList(); map_ptrloc *LastDesc = &Ver->DescriptionList; @@ -143,7 +145,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // don't add a new description if we have one for the given // md5 && language - for ( ; Desc.end() == false; Desc++) + for ( ; Desc != 0 && Desc.end() == false; Desc++) if (MD5SumValue(Desc.md5()) == CurMd5 && Desc.LanguageCode() == List.DescriptionLanguage()) duplicate=true; @@ -151,7 +153,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, continue; for (Desc = Ver.DescriptionList(); - Desc.end() == false; + Desc != 0 && Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++) { if (MD5SumValue(Desc.md5()) == CurMd5) @@ -160,7 +162,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc); Desc->ParentPkg = Pkg.Index(); - if (NewFileDesc(Desc,List) == false) + if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str()); break; } @@ -173,7 +175,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, pkgCache::VerIterator Ver = Pkg.VersionList(); map_ptrloc *LastVer = &Pkg->VersionList; int Res = 1; - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + for (; Ver != 0 && Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); if (Res >= 0) @@ -207,7 +209,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, // Skip to the end of the same version set. if (Res == 0) { - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) + for (; Ver != 0 && Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); if (Res != 0) @@ -220,7 +222,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List, Ver->ParentPkg = Pkg.Index(); Ver->Hash = Hash; - if (List.NewVersion(Ver) == false) + if ((*LastVer == 0 && _error->PendingError()) || List.NewVersion(Ver) == false) return _error->Error(_("Error occurred while processing %s (NewVersion1)"), PackageName.c_str()); @@ -246,13 +248,13 @@ bool pkgCacheGenerator::MergeList(ListParser &List, map_ptrloc *LastDesc = &Ver->DescriptionList; // Skip to the end of description set - for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++); + for (; Desc != 0 && Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++); // Add new description *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc); Desc->ParentPkg = Pkg.Index(); - if (NewFileDesc(Desc,List) == false) + if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false) return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str()); } @@ -304,7 +306,7 @@ bool pkgCacheGenerator::MergeFileProvides(ListParser &List) unsigned long Hash = List.VersionHash(); pkgCache::VerIterator Ver = Pkg.VersionList(); - for (; Ver.end() == false; Ver++) + for (; Ver != 0 && Ver.end() == false; Ver++) { if (Ver->Hash == Hash && Version.c_str() == Ver.VerStr()) { @@ -370,7 +372,7 @@ bool pkgCacheGenerator::NewFileVer(pkgCache::VerIterator &Ver, // Link it to the end of the list map_ptrloc *Last = &Ver->FileList; - for (pkgCache::VerFileIterator V = Ver.FileList(); V.end() == false; V++) + for (pkgCache::VerFileIterator V = Ver.FileList(); V != 0 && V.end() == false; V++) Last = &V->NextFile; VF->NextFile = *Last; *Last = VF.Index(); @@ -419,14 +421,14 @@ bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc, // Get a structure unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile)); if (DescFile == 0) - return 0; + return false; pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile); DF->File = CurrentFile - Cache.PkgFileP; // Link it to the end of the list map_ptrloc *Last = &Desc->FileList; - for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++) + for (pkgCache::DescFileIterator D = Desc.FileList(); D != 0 && D.end() == false; D++) Last = &D->NextFile; DF->NextFile = *Last; @@ -460,6 +462,8 @@ map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc, Desc->ID = Cache.HeaderP->DescriptionCount++; Desc->language_code = Map.WriteString(Lang); Desc->md5sum = Map.WriteString(md5sum.Value()); + if (Desc->language_code == 0 || Desc->md5sum == 0) + return 0; return Description; } @@ -514,7 +518,7 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator Ver, if (OldDepVer != Ver) { OldDepLast = &Ver->DependsList; - for (pkgCache::DepIterator D = Ver.DependsList(); D.end() == false; D++) + for (pkgCache::DepIterator D = Ver.DependsList(); D != 0 && D.end() == false; D++) OldDepLast = &D->NextDepends; OldDepVer = Ver; } @@ -809,7 +813,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, unsigned long EndOfSource = Files.size(); if (_system->AddStatusFiles(Files) == false) return false; - + // Decide if we can write to the files.. string CacheFile = _config->FindFile("Dir::Cache::pkgcache"); string SrcCacheFile = _config->FindFile("Dir::Cache::srcpkgcache"); @@ -861,8 +865,9 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress, { // Preload the map with the source cache FileFd SCacheF(SrcCacheFile,FileFd::ReadOnly); - if (SCacheF.Read((unsigned char *)Map->Data() + Map->RawAllocate(SCacheF.Size()), - SCacheF.Size()) == false) + unsigned long alloc = Map->RawAllocate(SCacheF.Size()); + if (alloc == 0 || SCacheF.Read((unsigned char *)Map->Data() + alloc, + SCacheF.Size()) == false) return false; TotalSize = ComputeSize(Files.begin()+EndOfSource,Files.end()); diff --git a/debian/changelog b/debian/changelog index e4da484d4..ea7e0469b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,8 +37,8 @@ apt (0.7.22) UNRELEASED; urgency=low * versions with a pin of -1 shouldn't be a candidate (Closes: #355237) * prefer mmap as memory allocator in MMap instead of a static char array which can (at least in theory) grow dynamic - * add a segfault handler to MMap to show the Cache-Limit message, which - can be deactivated with MMap::SegfaultHandler=false (Closes: 535218) + * eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc + which can arise if cache doesn't fit into the mmap (Closes: #535218) * display warnings instead of errors if the parts dirs doesn't exist [ Michael Vogt ] -- cgit v1.2.3-70-g09d2 From 0fad7309fbc20a7ca838e241e5118bf56f39946c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Jul 2009 16:58:17 +0200 Subject: debian/apt.cron.daily: add missing check_size_constrains --- debian/apt.cron.daily | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 8c2bd22d9..39bf5bc1d 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -438,6 +438,9 @@ else debug_echo "autoclean (not run)" fi +# check cache size +check_size_constraints + # # vim: set sts=4 ai : # -- cgit v1.2.3-70-g09d2 From aff278bfea6ebb29cad5de272eb9539057ddd3bd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Jul 2009 17:50:54 +0200 Subject: Only run Download-Upgradable and Unattended-Upgrades if the initial update was successful Closes: #341970 --- debian/apt.cron.daily | 8 +++++--- debian/changelog | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 39bf5bc1d..cc81a3a69 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -335,7 +335,7 @@ if which on_ac_power >/dev/null; then fi # check if we can lock the cache and if the cache is clean -if which apt-get >/dev/null && ! eval apt-get check $XAPTOPT $XSTDERR ; then +if which apt-get >/dev/null && ! eval apt-get check -f $XAPTOPT $XSTDERR ; then debug_echo "error encountered in cron job with \"apt-get check\"." exit 0 fi @@ -378,6 +378,7 @@ do_cache_backup $BackupArchiveInterval random_sleep # update package lists +UPDATED=0 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp if check_stamp $UPDATE_STAMP $UpdateInterval; then if eval apt-get $XAPTOPT -y update $XSTDERR; then @@ -392,6 +393,7 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then debug_echo "dbus signal not send (command not available)" fi update_stamp $UPDATE_STAMP + UPDATED=1 else debug_echo "download updated metadata (error)" fi @@ -401,7 +403,7 @@ fi # download all upgradeable packages (if it is requested) DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp -if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then +if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP debug_echo "download upgradable (success)" @@ -414,7 +416,7 @@ fi # auto upgrade all upgradeable packages UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp -if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then +if [ $UPDATED -eq 1 ] && which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then if unattended-upgrade $XUUPOPT; then update_stamp $UPGRADE_STAMP debug_echo "unattended-upgrade (success)" diff --git a/debian/changelog b/debian/changelog index cf9231105..668cf5596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,6 @@ apt (0.7.21) UNRELEASED; urgency=low * Updated cron script to support backups by hardlinks and verbose levels. All features turned off by default. * Added more error handlings. Closes: #438803, #462734, #454989, - * Refactored condition structure to make download and upgrade performed - if only previous steps succeeded. Closes: #341970 * Documented all cron script related configuration items in configure-index. @@ -29,7 +27,9 @@ apt (0.7.21) UNRELEASED; urgency=low HttpMethod::ServerDie() (LP: #385144) * apt-pkg/deb/dpkgpm.cc: - provide DPkg::Chroot-Directory config option (useful for testing) - + * Only run Download-Upgradable and Unattended-Upgrades if the initial + update was successful Closes: #341970 + -- Michael Vogt Thu, 28 May 2009 17:51:42 +0200 [ Michael Vogt ] -- cgit v1.2.3-70-g09d2 From d82cdf7391f04a98e5fb954ca23506f7f52435b0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Jul 2009 09:40:02 +0200 Subject: * doc/apt.conf.5.xml: - merged patch from Aurélien Couderc to improve the text (thanks!) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++---- doc/apt.conf.5.xml | 12 ++++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 668cf5596..2fb53972d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,10 +29,6 @@ apt (0.7.21) UNRELEASED; urgency=low - provide DPkg::Chroot-Directory config option (useful for testing) * Only run Download-Upgradable and Unattended-Upgrades if the initial update was successful Closes: #341970 - - -- Michael Vogt Thu, 28 May 2009 17:51:42 +0200 - - [ Michael Vogt ] * apt-pkg/indexcopy.cc: - support having CDs with no Packages file (just a Packages.gz) by not forcing a verification on non-existing files @@ -77,6 +73,9 @@ apt (0.7.21) UNRELEASED; urgency=low * build fixes for g++-4.4 * cmdline/apt-mark: - add "showauto" option to show automatically installed packages + * doc/apt.conf.5.xml: + - merged patch from Aurélien Couderc to improve the text + (thanks!) [ Dereck Wonnacott ] * apt-ftparchive might write corrupt Release files (LP: #46439) diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 1835f2282..6590c9795 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -70,7 +70,7 @@ APT { with newlines placed to make it more readable. Lists can be created by - opening a scope and including a single word enclosed in quotes followed by a + opening a scope and including a single string enclosed in quotes followed by a semicolon. Multiple entries can be included, each separated by a semicolon. @@ -87,7 +87,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Two specials are allowed, #include and #clear #include will include the given file, unless the filename ends in a slash, then the whole directory is included. - #clear is used to erase a list of names. + #clear is used to erase a part of the configuration tree. The + specified element and all its descendents are erased. 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 @@ -173,7 +174,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; PDiffs - Try do download deltas called PDiffs for + Try to download deltas called PDiffs for Packages or Sources files instead of downloading whole ones. True by default. @@ -683,7 +684,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Debug::pkgInitConfig - Dump the default configuration to standard output on + Dump the default configuration to standard error on startup. @@ -766,6 +767,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + -- cgit v1.2.3-70-g09d2 From 95afdfd096e0275c78a6ee7b1148f84af530650e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 25 Jul 2009 16:00:41 -0300 Subject: Apply patch from Sami Liedes to reduce the number of times we call progress bar updating and debugging configuration settings. --- apt-pkg/depcache.cc | 39 ++++++++++++++++++++++++++------------- debian/changelog | 5 +++++ 2 files changed, 31 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index e17b7b0e8..5c011d743 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -127,9 +127,12 @@ bool pkgDepCache::Init(OpProgress *Prog) /* Set the current state of everything. In this state all of the packages are kept exactly as is. See AllUpgrade */ int Done = 0; + int Update_interval = Head().PackageCount/100; + if (Update_interval == 0) + Update_interval = 1; for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++) { - if (Prog != 0) + if (Prog != 0 && Done%Update_interval == 0) Prog->Progress(Done); // Find the proper cache slot @@ -175,6 +178,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ pkgTagFile tagfile(&state_file); pkgTagSection section; int amt=0; + bool debug_autoremove=_config->FindB("Debug::pkgAutoRemove",false); while(tagfile.Step(section)) { string pkgname = section.FindS("Package"); pkgCache::PkgIterator pkg=Cache->FindPkg(pkgname); @@ -184,7 +188,7 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ short reason = section.FindI("Auto-Installed", 0); if(reason > 0) PkgState[pkg->ID].Flags |= Flag::Auto; - if(_config->FindB("Debug::pkgAutoRemove",false)) + if(debug_autoremove) std::cout << "Auto-Installed : " << pkgname << std::endl; amt+=section.size(); if(Prog != NULL) @@ -202,7 +206,9 @@ bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ /*}}}*/ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ { - if(_config->FindB("Debug::pkgAutoRemove",false)) + bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); + + if(debug_autoremove) std::clog << "pkgDepCache::writeStateFile()" << std::endl; FileFd StateFile; @@ -257,14 +263,14 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { if(PkgState[pkg->ID].Flags & Flag::Auto) { if (pkgs_seen.find(pkg.Name()) != pkgs_seen.end()) { - if(_config->FindB("Debug::pkgAutoRemove",false)) + if(debug_autoremove) std::clog << "Skipping already written " << pkg.Name() << std::endl; continue; } // skip not installed ones if requested if(InstalledOnly && pkg->CurrentVer == 0) continue; - if(_config->FindB("Debug::pkgAutoRemove",false)) + if(debug_autoremove) std::clog << "Writing new AutoInstall: " << pkg.Name() << std::endl; ostr.str(string("")); @@ -609,9 +615,12 @@ void pkgDepCache::Update(OpProgress *Prog) // Perform the depends pass int Done = 0; + int Update_interval = Head().PackageCount; + if (Update_interval == 0) + Update_interval = 1; for (PkgIterator I = PkgBegin(); I.end() != true; I++,Done++) { - if (Prog != 0 && Done%20 == 0) + if (Prog != 0 && Done%Update_interval == 0) Prog->Progress(Done); for (VerIterator V = I.VersionList(); V.end() != true; V++) { @@ -1326,6 +1335,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) { bool follow_recommends; bool follow_suggests; + bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); // init the states for(PkgIterator p = PkgBegin(); !p.end(); ++p) @@ -1334,8 +1344,7 @@ bool pkgDepCache::MarkRequired(InRootSetFunc &userFunc) PkgState[p->ID].Garbage = false; // debug output - if(_config->FindB("Debug::pkgAutoRemove",false) - && PkgState[p->ID].Flags & Flag::Auto) + if(debug_autoremove && PkgState[p->ID].Flags & Flag::Auto) std::clog << "AutoDep: " << p.Name() << std::endl; } @@ -1406,7 +1415,9 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, if(state.Marked) return; - if(_config->FindB("Debug::pkgAutoRemove",false)) + bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove", false); + + if(debug_autoremove) { std::clog << "Marking: " << pkg.Name(); if(!ver.end()) @@ -1437,7 +1448,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, { if(_system->VS->CheckDep(V.VerStr(), d->CompareOp, d.TargetVer())) { - if(_config->FindB("Debug::pkgAutoRemove",false)) + if(debug_autoremove) { std::clog << "Following dep: " << d.ParentPkg().Name() << " " << d.ParentVer().VerStr() << " " @@ -1461,7 +1472,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, if(_system->VS->CheckDep(prv.ProvideVersion(), d->CompareOp, d.TargetVer())) { - if(_config->FindB("Debug::pkgAutoRemove",false)) + if(debug_autoremove) { std::clog << "Following dep: " << d.ParentPkg().Name() << " " << d.ParentVer().VerStr() << " " @@ -1489,9 +1500,11 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, /*}}}*/ bool pkgDepCache::Sweep() /*{{{*/ { + bool debug_autoremove = _config->FindB("Debug::pkgAutoRemove",false); + // do the sweep for(PkgIterator p=PkgBegin(); !p.end(); ++p) - { + { StateCache &state=PkgState[p->ID]; // skip required packages @@ -1503,7 +1516,7 @@ bool pkgDepCache::Sweep() /*{{{*/ if(!state.Marked && (!p.CurrentVer().end() || state.Install())) { state.Garbage=true; - if(_config->FindB("Debug::pkgAutoRemove",false)) + if(debug_autoremove) std::cout << "Garbage: " << p.Name() << std::endl; } } diff --git a/debian/changelog b/debian/changelog index 30edf0757..64271088f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -123,6 +123,11 @@ apt (0.7.22) UNRELEASED; urgency=low * apt-ftparchive might write corrupt Release files (LP: #46439) * Apply --important option to apt-cache depends (LP: #16947) + [ Otavio Salvador ] + * Apply patch from Sami Liedes to reduce the + number of times we call progress bar updating and debugging + configuration settings. + -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 apt (0.7.21) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 76fcbe5c97849dcbbe67434d08e0a22c02fedd51 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 25 Jul 2009 16:29:49 -0300 Subject: Apply patch from Sami Liedes to avoid unecessary temporary allocations. --- apt-pkg/contrib/strutl.h | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index e1f9e3a1f..0cbf14a7a 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -66,6 +66,7 @@ bool CheckDomainList(const string &Host, const string &List); int tolower_ascii(int c); #define APT_MKSTRCMP(name,func) \ +inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \ inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ inline int name(string A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \ inline int name(string A,string B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \ diff --git a/debian/changelog b/debian/changelog index 64271088f..0404baf7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -127,6 +127,8 @@ apt (0.7.22) UNRELEASED; urgency=low * Apply patch from Sami Liedes to reduce the number of times we call progress bar updating and debugging configuration settings. + * Apply patch from Sami Liedes to avoid unecessary + temporary allocations. -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 -- cgit v1.2.3-70-g09d2 From d5752e18bed18c706c93f5c43c61016c72132ede Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jul 2009 22:12:50 +0200 Subject: releasing version 0.7.22 --- debian/changelog | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0404baf7b..3d5db5f48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ -apt (0.7.22) UNRELEASED; urgency=low +apt (0.7.22) unstable; urgency=low - The 'not dead yet' release - [ Christian Perrier ] * Documentation translations: - Fix a typo in apt-get(8) French translation. Closes: #525043 @@ -130,7 +128,7 @@ apt (0.7.22) UNRELEASED; urgency=low * Apply patch from Sami Liedes to avoid unecessary temporary allocations. - -- Julian Andres Klode Fri, 03 Jul 2009 08:27:35 +0200 + -- Michael Vogt Wed, 29 Jul 2009 19:16:22 +0200 apt (0.7.21) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 8dfb8a0ab2c2a06e319678701c144e5156d7e869 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jul 2009 15:28:21 +0200 Subject: * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) --- cmdline/apt-get.cc | 4 ++-- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 27e16d3f3..2693bd968 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1260,7 +1260,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, /* Lookup the version of the package we would install if we were to install a version and determine the source package name, then look in the archive for a source package of the same name. */ - if (_config->FindB("APT::Get::Only-Source") == false) + bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); + if (MatchSrcOnly == false) { if (Pkg.end() == false) { @@ -1278,7 +1279,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, unsigned long Offset = 0; string Version; bool IsMatch = false; - bool MatchSrcOnly = false; // No source package name.. if (Src.empty() == true) diff --git a/debian/changelog b/debian/changelog index 2fb53972d..59a88ca21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.22) unstable; urgency=low + + * cmdline/apt-get.cc: + - honor APT::Get::Only-Source properly in FindSrc() (thanks to + Martin Pitt for reporting the problem) + + -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + apt (0.7.21) UNRELEASED; urgency=low [ Osamu Aoki ] -- cgit v1.2.3-70-g09d2 From fa1d338f0c8770d574db4f3728ef4357765185f7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 30 Jul 2009 18:14:01 +0200 Subject: fix extra , at the end of the changelog line --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d39bf3d2f..cb5e74cb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,7 +121,7 @@ apt (0.7.22) unstable; urgency=low [ Osamu Aoki ] * Updated cron script to support backups by hardlinks and verbose levels. All features turned off by default. - * Added more error handlings. Closes: #438803, #462734, #454989, + * Added more error handlings. Closes: #438803, #462734, #454989 * Documented all cron script related configuration items in configure-index. -- cgit v1.2.3-70-g09d2 From 03dbbc98ba48eeb7c360c7fb02f21cdc9cd86465 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 31 Jul 2009 18:52:16 +0200 Subject: [cmdline/apt-get.cc] add APT::Get::HideAutoRemove=small to display only a short line instead of the full package list. (Closes: #537450) --- cmdline/apt-get.cc | 58 ++++++++++++++++------- debian/changelog | 6 +++ po/apt-all.pot | 136 ++++++++++++++++++++++++++++------------------------- 3 files changed, 117 insertions(+), 83 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ab6dca388..d3972ad81 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1400,20 +1400,29 @@ bool DoAutomaticRemove(CacheFile &Cache) bool Debug = _config->FindI("Debug::pkgAutoRemove",false); bool doAutoRemove = _config->FindB("APT::Get::AutomaticRemove", false); bool hideAutoRemove = _config->FindB("APT::Get::HideAutoRemove"); - pkgDepCache::ActionGroup group(*Cache); + pkgDepCache::ActionGroup group(*Cache); if(Debug) std::cout << "DoAutomaticRemove()" << std::endl; - if (_config->FindB("APT::Get::Remove",true) == false && - doAutoRemove == true) + // we don't want to autoremove and we don't want to see it, so why calculating? + if (doAutoRemove == false && hideAutoRemove == true) + return true; + + if (doAutoRemove == true && + _config->FindB("APT::Get::Remove",true) == false) { c1out << _("We are not supposed to delete stuff, can't start " "AutoRemover") << std::endl; - doAutoRemove = false; + return false; } + bool purgePkgs = _config->FindB("APT::Get::Purge", false); + bool smallList = (hideAutoRemove == false && + strcasecmp(_config->Find("APT::Get::HideAutoRemove","").c_str(),"small") == 0); + string autoremovelist, autoremoveversions; + unsigned long autoRemoveCount = 0; // look over the cache to see what can be removed for (pkgCache::PkgIterator Pkg = Cache->PkgBegin(); ! Pkg.end(); ++Pkg) { @@ -1422,30 +1431,43 @@ bool DoAutomaticRemove(CacheFile &Cache) if(Pkg.CurrentVer() != 0 || Cache[Pkg].Install()) if(Debug) std::cout << "We could delete %s" << Pkg.Name() << std::endl; - - // only show stuff in the list that is not yet marked for removal - if(Cache[Pkg].Delete() == false) - { - autoremovelist += string(Pkg.Name()) + " "; - autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; - } + if (doAutoRemove) { if(Pkg.CurrentVer() != 0 && Pkg->CurrentState != pkgCache::State::ConfigFiles) - Cache->MarkDelete(Pkg, _config->FindB("APT::Get::Purge", false)); + Cache->MarkDelete(Pkg, purgePkgs); else Cache->MarkKeep(Pkg, false, false); } + else + { + // only show stuff in the list that is not yet marked for removal + if(Cache[Pkg].Delete() == false) + { + // we don't need to fill the strings if we don't need them + if (smallList == true) + ++autoRemoveCount; + else + { + autoremovelist += string(Pkg.Name()) + " "; + autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; + } + } + } } } - if (!hideAutoRemove) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); - if (!doAutoRemove && !hideAutoRemove && autoremovelist.size() > 0) + // if we don't remove them, we should show them! + if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) + { + if (smallList == false) + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + else + ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; - - // Now see if we destroyed anything - if (Cache->BrokenCount() != 0) + } + // Now see if we had destroyed anything (if we had done anything) + else if (Cache->BrokenCount() != 0) { c1out << _("Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt.") << endl; diff --git a/debian/changelog b/debian/changelog index cb5e74cb6..46bd16df9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ apt (0.7.23) unstable; urgency=low + [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - add APT::Get::HideAutoRemove=small to display only a short line + instead of the full package list. (Closes: #537450) + -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 apt (0.7.22) unstable; urgency=low diff --git a/po/apt-all.pot b/po/apt-all.pot index a18646290..605bdb8c2 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-26 01:10+0200\n" +"POT-Creation-Date: 2009-07-31 18:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -151,7 +151,7 @@ msgstr "" #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2584 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2606 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1659 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1681 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2001 cmdline/apt-get.cc:2034 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2023 cmdline/apt-get.cc:2056 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2328 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2104 cmdline/apt-get.cc:2350 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2177 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2199 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -775,7 +775,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2225 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2247 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -784,7 +784,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1005 cmdline/apt-get.cc:2234 +#: cmdline/apt-get.cc:1005 cmdline/apt-get.cc:2256 msgid "Download complete and in download only mode" msgstr "" @@ -889,21 +889,26 @@ msgstr "" msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1411 +#: cmdline/apt-get.cc:1415 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1443 +#: cmdline/apt-get.cc:1464 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1445 +#: cmdline/apt-get.cc:1466 +#, c-format +msgid "%lu packages were automatically installed and are no longer required.\n" +msgstr "" + +#: cmdline/apt-get.cc:1467 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1450 +#: cmdline/apt-get.cc:1472 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -919,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1765 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1457 +#: cmdline/apt-get.cc:1479 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1476 +#: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1553 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1646 cmdline/apt-get.cc:1682 +#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1669 +#: cmdline/apt-get.cc:1691 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1700 +#: cmdline/apt-get.cc:1722 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1735 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1716 +#: cmdline/apt-get.cc:1738 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1728 +#: cmdline/apt-get.cc:1750 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -969,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1746 +#: cmdline/apt-get.cc:1768 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1775 +#: cmdline/apt-get.cc:1797 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1864 +#: cmdline/apt-get.cc:1886 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1865 +#: cmdline/apt-get.cc:1887 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:1916 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1897 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1919 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1902 +#: cmdline/apt-get.cc:1924 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1969 cmdline/apt-get.cc:1977 +#: cmdline/apt-get.cc:1991 cmdline/apt-get.cc:1999 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2099 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2107 cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2368 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2178 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2206 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2212 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:2221 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2252 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2258 +#: cmdline/apt-get.cc:2280 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2270 +#: cmdline/apt-get.cc:2292 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2293 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2288 +#: cmdline/apt-get.cc:2310 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2307 +#: cmdline/apt-get.cc:2329 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2323 +#: cmdline/apt-get.cc:2345 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2373 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2393 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2423 +#: cmdline/apt-get.cc:2445 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2498 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2512 +#: cmdline/apt-get.cc:2534 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2539 +#: cmdline/apt-get.cc:2561 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2553 +#: cmdline/apt-get.cc:2575 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2557 +#: cmdline/apt-get.cc:2579 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2589 +#: cmdline/apt-get.cc:2611 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2630 +#: cmdline/apt-get.cc:2652 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1158,7 +1163,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2797 +#: cmdline/apt-get.cc:2819 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1381,9 +1386,10 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" +#. only print the warning if we can't load a valid sourcefile in the end #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 -#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:163 -#: apt-pkg/sourcelist.cc:169 apt-pkg/sourcelist.cc:324 apt-pkg/acquire.cc:419 +#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 +#: apt-pkg/sourcelist.cc:174 apt-pkg/sourcelist.cc:332 apt-pkg/acquire.cc:419 #: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format @@ -2211,16 +2217,16 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:192 apt-pkg/depcache.cc:196 +#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:220 +#: apt-pkg/depcache.cc:223 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:226 +#: apt-pkg/depcache.cc:229 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2260,27 +2266,27 @@ msgstr "" msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:203 +#: apt-pkg/sourcelist.cc:211 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:228 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:248 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:252 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:260 apt-pkg/sourcelist.cc:263 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -- cgit v1.2.3-70-g09d2 From 0dae8ac5f8a3092057a80d932ae4e55c1e7d3ca5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 31 Jul 2009 20:29:50 +0200 Subject: [cmdline/apt-get.cc] ShowBroken() in build-dep (Closes: #145916) Patch from Mike O'Connor, thanks! --- cmdline/apt-get.cc | 5 ++++- debian/changelog | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index d3972ad81..ebb634b4f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2572,7 +2572,10 @@ bool DoBuildDep(CommandLine &CmdL) // Now we check the state of the packages, if (Cache->BrokenCount() != 0) - return _error->Error(_("Build-dependencies for %s could not be satisfied."),*I); + { + ShowBroken(cout, Cache, false); + return _error->Error(_("Build-dependencies for %s could not be satisfied."),*I); + } } if (InstallPackages(Cache, false, true) == false) diff --git a/debian/changelog b/debian/changelog index 46bd16df9..b105faaef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.23) unstable; urgency=low * cmdline/apt-get.cc: - add APT::Get::HideAutoRemove=small to display only a short line instead of the full package list. (Closes: #537450) + - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916) -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 -- cgit v1.2.3-70-g09d2 From d95cf70db1c0cc7d80d862b826ea67ac70c3e92d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 31 Jul 2009 20:42:06 +0200 Subject: [apt-pkg/contrib/strutl.cc] enable thousand separator according to the current locale. Patch from Luca Bruno (Closes: #223712) --- apt-pkg/contrib/strutl.cc | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index a991b8988..1683868c8 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -304,13 +304,13 @@ string SizeToStr(double Size) { if (ASize < 100 && I != 0) { - sprintf(S,"%.1f%c",ASize,Ext[I]); + sprintf(S,"%'.1f%c",ASize,Ext[I]); break; } if (ASize < 10000) { - sprintf(S,"%.0f%c",ASize,Ext[I]); + sprintf(S,"%'.0f%c",ASize,Ext[I]); break; } ASize /= 1000.0; diff --git a/debian/changelog b/debian/changelog index b105faaef..384f8864f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ apt (0.7.23) unstable; urgency=low - add APT::Get::HideAutoRemove=small to display only a short line instead of the full package list. (Closes: #537450) - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916) + * apt-pkg/contrib/strutl.cc: + - enable thousand separator according to the current locale + (by Luca Bruno, Closes: #223712) -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 -- cgit v1.2.3-70-g09d2 From 311e188ce858772bad0f622cf3d742a8acca80c0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 1 Aug 2009 19:47:20 +0200 Subject: [debian/changelog] add a Closes tag to mvo's --only-source patch --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 384f8864f..9987b7444 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ apt (0.7.23) unstable; urgency=low [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to - Martin Pitt for reporting the problem) + Martin Pitt for reporting the problem) (Closes: #535362) [ David Kalnischkies ] * cmdline/apt-get.cc: -- cgit v1.2.3-70-g09d2 From 33250e2f415611f820e24ba2f9f4d0e568d67d02 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 1 Aug 2009 19:50:42 +0200 Subject: [debian/changelog] correct two typos in the changelog for 0.7.22 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9987b7444..7f9cc0c02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -73,7 +73,7 @@ apt (0.7.22) unstable; urgency=low (off by default) - send "dpkg-exec" message on the status fd when dpkg is run - provide DPkg::Chroot-Directory config option (useful for testing) - - fix potential hang when in a backgroud process group + - fix potential hang when in a background process group * apt-pkg/algorithms.cc: - consider recommends when making the scores for the problem resolver @@ -102,7 +102,7 @@ apt (0.7.22) unstable; urgency=low * apt-pkg/deb/debsystem.cc: - make strings i18n able * fix problematic use of tolower() when calculating the version - hash by using locale independant tolower_ascii() function. + hash by using locale independent tolower_ascii() function. Thanks to M. Vefa Bicakci (LP: #80248) * build fixes for g++-4.4 * cmdline/apt-mark: -- cgit v1.2.3-70-g09d2 From 9da165db08e69a0a5a467b4d02d414006590308e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 2 Aug 2009 19:37:05 +0200 Subject: * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). --- apt-pkg/contrib/mmap.cc | 2 +- debian/changelog | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index aa52b4c30..4d5fcf71e 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -317,7 +317,7 @@ unsigned long DynamicMMap::WriteString(const char *String, but why we should not at least try to grow it before we give up? */ bool DynamicMMap::Grow() { -#ifdef _POSIX_MAPPED_FILES +#if defined(_POSIX_MAPPED_FILES) && defined(__linux__) unsigned long newSize = WorkSpace + 1024*1024; if(Fd != 0) diff --git a/debian/changelog b/debian/changelog index cb5e74cb6..4e3177efe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ apt (0.7.23) unstable; urgency=low + [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to Martin Pitt for reporting the problem) - -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 + [ Julian Andres Klode ] + * apt-pkg/contrib/mmap.cc: + - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on + non-Linux architectures (as it uses mremap). + + -- Julian Andres Klode Sun, 02 Aug 2009 19:35:23 +0200 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 67793cf3c90c40941d5445335345cf4042d44206 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:02:14 +0200 Subject: * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). --- apt-pkg/sourcelist.cc | 9 ++++++--- debian/changelog | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 47a08ad90..4b3abe918 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -157,15 +157,18 @@ bool pkgSourceList::ReadMainList() // CNC:2003-11-28 - Entries in sources.list have priority over // entries in sources.list.d. string Main = _config->FindFile("Dir::Etc::sourcelist"); + string Parts = _config->FindDir("Dir::Etc::sourceparts"); + if (FileExists(Main) == true) Res &= ReadAppend(Main); - else + else if (FileExists(Parts) == false) + // Only warn if there are no sources.list.d. _error->WarningE("FileExists",_("Unable to read %s"),Main.c_str()); - string Parts = _config->FindDir("Dir::Etc::sourceparts"); if (FileExists(Parts) == true) Res &= ReadSourceDir(Parts); - else + else if (FileExists(Main) == false) + // Only warn if there is no sources.list file. _error->WarningE("FileExists",_("Unable to read %s"),Parts.c_str()); return Res; diff --git a/debian/changelog b/debian/changelog index 4e3177efe..b360a0b23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on non-Linux architectures (as it uses mremap). + * apt-pkg/sourcelist.cc: + - Only warn about missing sources.list if there is no sources.list.d + and vice versa as only one of them is needed (Closes: #539731). - -- Julian Andres Klode Sun, 02 Aug 2009 19:35:23 +0200 + -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 apt (0.7.22) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 48778d1198eb37dca437a878cd0b97a7cfb4e32e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:20:07 +0200 Subject: debian/control: Add myself to Uploaders. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b360a0b23..2e4923740 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). + * debian/control: + - Add myself to Uploaders. -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 diff --git a/debian/control b/debian/control index 84c411509..910436d19 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , - Luca Bruno + Luca Bruno , Julian Andres Klode Standards-Version: 3.8.1.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From 05ecd9b6027842cbdbc461b0eeb48c74bc8accbe Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:34:39 +0200 Subject: Set version to 0.7.22.1. --- configure.in | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index 48b1def5c..9131e2fbe 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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.21") +AC_DEFINE_UNQUOTED(VERSION,"0.7.22.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 2e4923740..646bf745c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -apt (0.7.23) unstable; urgency=low +apt (0.7.22.1) unstable; urgency=low [ Michael Vogt ] * cmdline/apt-get.cc: - honor APT::Get::Only-Source properly in FindSrc() (thanks to - Martin Pitt for reporting the problem) + Martin Pitt for reporting the problem), also Closes: #535362. [ Julian Andres Klode ] * apt-pkg/contrib/mmap.cc: -- cgit v1.2.3-70-g09d2 From 00388ba3ec5af81f529d038f0c44eb4e20504f14 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:40:11 +0200 Subject: debian/changelog: Close the FTBFS on kFreeBSD bug. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 646bf745c..f2e7552dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ apt (0.7.22.1) unstable; urgency=low [ Julian Andres Klode ] * apt-pkg/contrib/mmap.cc: - Fix FTBFS on GNU/kFreeBSD by disabling DynamicMMap::Grow() on - non-Linux architectures (as it uses mremap). + non-Linux architectures as it uses mremap (Closes: #539742). * apt-pkg/sourcelist.cc: - Only warn about missing sources.list if there is no sources.list.d and vice versa as only one of them is needed (Closes: #539731). -- cgit v1.2.3-70-g09d2 From e0423680dc09d64afdc62bf3a756a8ef9849365b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 3 Aug 2009 13:48:29 +0200 Subject: debian/control: Increase Standards-Version to 3.8.2.0. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f2e7552dd..59d9a0b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.7.22.1) unstable; urgency=low and vice versa as only one of them is needed (Closes: #539731). * debian/control: - Add myself to Uploaders. + - Increase Standards-Version to 3.8.2.0. -- Julian Andres Klode Mon, 03 Aug 2009 12:48:31 +0200 diff --git a/debian/control b/debian/control index 910436d19..cb20e2864 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode -Standards-Version: 3.8.1.0 +Standards-Version: 3.8.2.0 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From 2b5c0d21114e200f524c2ff199bf1ce9e0d923fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 3 Aug 2009 14:44:28 +0200 Subject: [debian/changlog] add entry for the "missing source.list file" fix * apt-pkg/sourcelist.cc: - only show warning about missing sources.list file if no we have no valid sourceentry (Closes: #539731) --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7f9cc0c02..5822fcae6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ apt (0.7.23) unstable; urgency=low * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) + * apt-pkg/sourcelist.cc: + - only show warning about missing sources.list file if no we have + no valid sourceentry (Closes: #539731) -- Michael Vogt Thu, 30 Jul 2009 15:27:30 +0200 -- cgit v1.2.3-70-g09d2 From 6985efb330487fb4ceb3fea0b4bfc86010c6d7f8 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:12:20 +0200 Subject: debian/apt.cron.daily: Make sure that VERBOSE is always set before accessing it (Closes: #539366) --- debian/apt.cron.daily | 4 +--- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 4f47ccfab..35ee5db6c 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -320,11 +320,9 @@ if ! which apt-config >/dev/null ; then fi # Set VERBOSE mode from apt-config (or inherit from environment) +VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) debug_echo "verbose level $VERBOSE" -if [ -z "$VERBOSE" ]; then - VERBOSE="0" -fi if [ "$VERBOSE" -le 2 ]; then # quiet for 0,1,2 XSTDOUT=">/dev/null" diff --git a/debian/changelog b/debian/changelog index 59d9a0b27..377cc6b57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.22.2) unstable; urgency=low + + * debian/apt.cron.daily: Make sure that VERBOSE is always set + before accessing it (Closes: #539366) + + -- Julian Andres Klode Thu, 06 Aug 2009 12:07:55 +0200 + apt (0.7.22.1) unstable; urgency=low [ Michael Vogt ] -- cgit v1.2.3-70-g09d2 From 17443d48b60b1abad4d16a2b6a3e3b3199bfa7d3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:33:57 +0200 Subject: debian/apt.cron.daily: Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) --- debian/apt.cron.daily | 11 +++++++++++ debian/changelog | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 35ee5db6c..3973e63b5 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -14,6 +14,9 @@ # Dir::Cache::Archive "archives/"; # - Set package archive directory # +# APT::Periodic::Enable "1"; +# - Enable the update/upgrade script (0=disable) +# # APT::Periodic::BackupArchiveInterval "0"; # - Backup after n-days if archive contents changed.(0=disable) # @@ -319,6 +322,14 @@ if ! which apt-config >/dev/null ; then exit 0 fi +# check if the user really wants to do something +AutoAptEnable=1 # default is yes +eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) + +if [ AutoAptEnable -eq 0 ]; then + exit 0 +fi + # Set VERBOSE mode from apt-config (or inherit from environment) VERBOSE=0 eval $(apt-config shell VERBOSE APT::Periodic::Verbose) diff --git a/debian/changelog b/debian/changelog index 377cc6b57..21772e5df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ apt (0.7.22.2) unstable; urgency=low - * debian/apt.cron.daily: Make sure that VERBOSE is always set - before accessing it (Closes: #539366) + * debian/apt.cron.daily: + - Make sure that VERBOSE is always set (Closes: #539366) + - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) - -- Julian Andres Klode Thu, 06 Aug 2009 12:07:55 +0200 + -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 apt (0.7.22.1) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 6b519e4227f41980b6de18a882808df92f1e36f1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:48:41 +0200 Subject: debian/apt.cron.daily: Support using debdelta to download packages (Closes: #532079) --- debian/apt.cron.daily | 11 ++++++++++- debian/changelog | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 3973e63b5..a09eeaca8 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -49,7 +49,10 @@ # # APT::Periodic::Download-Upgradeable-Packages "0"; # - Do "apt-get upgrade --download-only" every n-days (0=disable) -# +# +# APT::Periodic::Download-Upgradeable-Packages-Debdelta "1"; +# - Use debdelta-upgrade to download updates if available (0=disable) +# # APT::Periodic::Unattended-Upgrade "0"; # - Run the "unattended-upgrade" security upgrade script # every n-days (0=disabled) @@ -395,6 +398,9 @@ eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) BackupArchiveInterval=0 eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterval) +Debdelta=1 +eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) + # check if we actually have to do anything if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && @@ -438,6 +444,9 @@ fi # download all upgradeable packages (if it is requested) DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp if [ $UPDATED -eq 1 ] && check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then + if [ $Debdelta -eq 1 ]; then + debdelta-upgrade >/dev/null 2>&1 || true + fi if eval apt-get $XAPTOPT -y -d dist-upgrade $XSTDERR; then update_stamp $DOWNLOAD_UPGRADEABLE_STAMP debug_echo "download upgradable (success)" diff --git a/debian/changelog b/debian/changelog index 21772e5df..2d3446d48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ apt (0.7.22.2) unstable; urgency=low * debian/apt.cron.daily: - Make sure that VERBOSE is always set (Closes: #539366) - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476) + - Support using debdelta to download packages (Closes: #532079) -- Julian Andres Klode Thu, 06 Aug 2009 12:17:19 +0200 -- cgit v1.2.3-70-g09d2 From 9a64707c285290c4e191e04d92c0fab9f6f118f5 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Thu, 6 Aug 2009 12:54:27 +0200 Subject: debian/apt.cron.daily: Fix issue related to APT::Periodic::Enable. --- debian/apt.cron.daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index a09eeaca8..b6099ee75 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -329,7 +329,7 @@ fi AutoAptEnable=1 # default is yes eval $(apt-config shell AutoAptEnable APT::Periodic::Enable) -if [ AutoAptEnable -eq 0 ]; then +if [ $AutoAptEnable -eq 0 ]; then exit 0 fi -- cgit v1.2.3-70-g09d2 From cfb3d242ded4b9d3e5f4f55a3139561fe78155db Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Aug 2009 12:25:48 +0200 Subject: [apt-pkg/indexcopy.cc] fix a (hypothetical) memory leak then the Release file not exists, patch from George Danchev, thanks! (Closes: #511556) --- apt-pkg/indexcopy.cc | 3 +++ debian/changelog | 3 +++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 15696585a..0142d7dbe 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -592,7 +592,10 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector &SigList, // a Release.gpg without a Release should never happen if(!FileExists(*I+"Release")) + { + delete MetaIndex; continue; + } // verify the gpg signature of "Release" diff --git a/debian/changelog b/debian/changelog index 403911833..408070b69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) + * apt-pkg/indexcopy.cc: + - fix a (hypothetical) memory leak then the Release file not exists + (by George Danchev, Closes: #511556) -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 034960416c99c4737f99536c55b77cc9a27b8d66 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Aug 2009 12:40:00 +0200 Subject: [cmdline/apt-cache.cc] fix a memory leak in the xvcg method Patch from George Danchev, thanks (Closes: #511557) --- cmdline/apt-cache.cc | 6 +++++- debian/changelog | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc index 0e950310b..7d7f58a62 100644 --- a/cmdline/apt-cache.cc +++ b/cmdline/apt-cache.cc @@ -929,7 +929,11 @@ bool XVcg(CommandLine &CmdL) Shapes[ShapeMap[Pkg->ID]]); } - + + delete[] Show; + delete[] Flags; + delete[] ShapeMap; + printf("}\n"); return true; } diff --git a/debian/changelog b/debian/changelog index 408070b69..e82057d8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,12 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) + + [ George Danchev ] + * cmdline/apt-cache.cc: + - fix a memory leak in the xvcg method (Closes: #511557) * apt-pkg/indexcopy.cc: - - fix a (hypothetical) memory leak then the Release file not exists - (by George Danchev, Closes: #511556) + - fix a memory leak then the Release file not exists (Closes: #511556) -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 6e2525a1d9c0930fea9fa65514d7b813f27997f0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 8 Aug 2009 18:27:47 +0200 Subject: [doc/apt.conf.5.xml] mention the apt.conf.d dir Patch from Vincent McIntyre, thanks! (Closes: #520831) --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e82057d8e..e4b498a93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) + * doc/apt.conf.5.xml: + - mention the apt.conf.d dir (by Vincent McIntyre, Closes: #520831) [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 2b2430c83..85a7d961c 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -822,7 +822,17 @@ is commented. Files - /etc/apt/apt.conf + + /etc/apt/apt.conf + APT configuration file. + Configuration Item: Dir::Etc::Main. + + + /etc/apt/apt.conf.d/ + APT configuration file fragments. + Configuration Item: Dir::Etc::Parts. + + See Also -- cgit v1.2.3-70-g09d2 From f64196e879103151f3b90ba423dc74ef61ea8c76 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Aug 2009 10:21:00 +0200 Subject: [cmdline/apt-get.cc] check for availability ofstatfs.f_type Patch from Robert Millan, thanks! (Closes: #509313) --- cmdline/apt-get.cc | 14 +++- configure.in | 4 + debian/changelog | 1 + po/apt-all.pot | 212 ++++++++++++++++++++++++++--------------------------- 4 files changed, 121 insertions(+), 110 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ebb634b4f..384953a6b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -868,8 +868,11 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) { struct statfs Stat; - if (statfs(OutputDir.c_str(),&Stat) != 0 || - unsigned(Stat.f_type) != RAMFS_MAGIC) + if (statfs(OutputDir.c_str(),&Stat) != 0 +#if HAVE_STRUCT_STATFS_F_TYPE + || unsigned(Stat.f_type) != RAMFS_MAGIC +#endif + ) return _error->Error(_("You don't have enough free space in %s."), OutputDir.c_str()); } @@ -2201,8 +2204,11 @@ bool DoSource(CommandLine &CmdL) if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) { struct statfs Stat; - if (statfs(OutputDir.c_str(),&Stat) != 0 || - unsigned(Stat.f_type) != RAMFS_MAGIC) + if (statfs(OutputDir.c_str(),&Stat) != 0 +#if HAVE_STRUCT_STATFS_F_TYPE + || unsigned(Stat.f_type) != RAMFS_MAGIC +#endif + ) return _error->Error(_("You don't have enough free space in %s"), OutputDir.c_str()); } diff --git a/configure.in b/configure.in index 9131e2fbe..0dd1beb1a 100644 --- a/configure.in +++ b/configure.in @@ -112,6 +112,10 @@ if test x"$HAVE_STATVFS" != x"yes"; then ]) fi +AC_CHECK_MEMBERS([struct statfs.f_type],,, + [$ac_includes_default + #include ]) + dnl We should use the real timegm function if we have it. AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) AC_SUBST(HAVE_TIMEGM) diff --git a/debian/changelog b/debian/changelog index e4b498a93..fd6f853e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ apt (0.7.22.3) unstable; urgency=low - add APT::Get::HideAutoRemove=small to display only a short line instead of the full package list. (Closes: #537450) - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916) + - check for statfs.f_type (by Robert Millan, Closes: #509313) * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) diff --git a/po/apt-all.pot b/po/apt-all.pot index 78c9c94e0..3ec999f76 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-08 09:46+0200\n" +"POT-Creation-Date: 2009-08-09 10:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,8 +21,8 @@ msgid "Package %s version %s has an unmet dep:\n" msgstr "" #: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 -#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1017 -#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1571 +#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 +#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575 #, c-format msgid "Unable to locate package %s" msgstr "" @@ -91,72 +91,72 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1217 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1293 +#: cmdline/apt-cache.cc:1297 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1447 +#: cmdline/apt-cache.cc:1451 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1528 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1545 +#: cmdline/apt-cache.cc:1549 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1557 cmdline/apt-cache.cc:1598 +#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1582 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1580 cmdline/apt-cache.cc:1588 +#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1585 +#: cmdline/apt-cache.cc:1589 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1595 +#: cmdline/apt-cache.cc:1599 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1608 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1619 +#: cmdline/apt-cache.cc:1623 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2609 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2615 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1721 +#: cmdline/apt-cache.cc:1725 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -549,7 +549,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1681 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1684 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -692,7 +692,7 @@ msgstr "" msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 msgid "There are problems and -y was used without --force-yes" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2023 cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2026 cmdline/apt-get.cc:2059 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2104 cmdline/apt-get.cc:2350 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2107 cmdline/apt-get.cc:2356 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -741,25 +741,25 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2199 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2202 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:873 +#: cmdline/apt-get.cc:876 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:909 +#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:894 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:896 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -767,74 +767,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:899 cmdline/apt-get.cc:918 +#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:914 +#: cmdline/apt-get.cc:917 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:986 cmdline/apt-get.cc:2247 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2253 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1004 +#: cmdline/apt-get.cc:1007 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1005 cmdline/apt-get.cc:2256 +#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2262 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1014 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1015 +#: cmdline/apt-get.cc:1018 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1024 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1055 +#: cmdline/apt-get.cc:1058 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1065 +#: cmdline/apt-get.cc:1068 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1083 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1094 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1109 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1114 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1116 +#: cmdline/apt-get.cc:1119 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -842,73 +842,73 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1135 +#: cmdline/apt-get.cc:1138 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1138 +#: cmdline/apt-get.cc:1141 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1158 +#: cmdline/apt-get.cc:1161 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1169 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1198 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1197 +#: cmdline/apt-get.cc:1200 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1203 +#: cmdline/apt-get.cc:1206 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1309 +#: cmdline/apt-get.cc:1312 #, c-format msgid "No source package '%s' picking '%s' instead\n" msgstr "" -#: cmdline/apt-get.cc:1346 +#: cmdline/apt-get.cc:1349 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1359 +#: cmdline/apt-get.cc:1362 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1415 +#: cmdline/apt-get.cc:1418 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1467 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1466 +#: cmdline/apt-get.cc:1469 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -#: cmdline/apt-get.cc:1467 +#: cmdline/apt-get.cc:1470 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1472 +#: cmdline/apt-get.cc:1475 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -924,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1765 +#: cmdline/apt-get.cc:1478 cmdline/apt-get.cc:1768 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1479 +#: cmdline/apt-get.cc:1482 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1501 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1553 +#: cmdline/apt-get.cc:1556 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1671 cmdline/apt-get.cc:1707 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1691 +#: cmdline/apt-get.cc:1694 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1722 +#: cmdline/apt-get.cc:1725 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1738 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1741 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1753 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -974,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1771 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1797 +#: cmdline/apt-get.cc:1800 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1886 +#: cmdline/apt-get.cc:1889 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1887 +#: cmdline/apt-get.cc:1890 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1916 +#: cmdline/apt-get.cc:1919 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1919 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1922 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1927 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1991 cmdline/apt-get.cc:1999 +#: cmdline/apt-get.cc:1994 cmdline/apt-get.cc:2002 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2102 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2368 +#: cmdline/apt-get.cc:2132 cmdline/apt-get.cc:2374 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2181 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2206 +#: cmdline/apt-get.cc:2212 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2218 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2215 +#: cmdline/apt-get.cc:2221 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2227 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:2258 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2280 +#: cmdline/apt-get.cc:2286 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2292 +#: cmdline/apt-get.cc:2298 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2293 +#: cmdline/apt-get.cc:2299 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2316 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2335 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2351 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2373 +#: cmdline/apt-get.cc:2379 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2399 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2445 +#: cmdline/apt-get.cc:2451 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2498 +#: cmdline/apt-get.cc:2504 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2534 +#: cmdline/apt-get.cc:2540 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2561 +#: cmdline/apt-get.cc:2567 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2577 +#: cmdline/apt-get.cc:2583 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2582 +#: cmdline/apt-get.cc:2588 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2614 +#: cmdline/apt-get.cc:2620 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2655 +#: cmdline/apt-get.cc:2661 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1163,7 +1163,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2822 +#: cmdline/apt-get.cc:2828 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -2641,22 +2641,22 @@ msgstr "" msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:832 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -- cgit v1.2.3-70-g09d2 From 472e2c3aa9c8ea38c2b5f0639bdb09eadb7ffca4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Aug 2009 10:22:53 +0200 Subject: [apt-inst/contrib/arfile.cc] use sizeof instead strlen Patch from Marius Vollmer, thanks! (Closes: #504325) --- apt-inst/contrib/arfile.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 7c85f2e86..e6c63d1ab 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -96,7 +96,7 @@ bool ARArchive::LoadHeaders() char S[300]; unsigned long Len; if (StrToNum(Head.Name+3,Len,sizeof(Head.Size)-3) == false || - Len >= strlen(S)) + Len >= sizeof(S)) { delete Memb; return _error->Error(_("Invalid archive member header")); diff --git a/debian/changelog b/debian/changelog index fd6f853e0..841661c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.7.22.3) unstable; urgency=low (by Luca Bruno, Closes: #223712) * doc/apt.conf.5.xml: - mention the apt.conf.d dir (by Vincent McIntyre, Closes: #520831) + * apt-inst/contrib/arfile.cc: + - use sizeof instead strlen (by Marius Vollmer, Closes: #504325) [ George Danchev ] * cmdline/apt-cache.cc: -- cgit v1.2.3-70-g09d2 From b2fa014bbefa8fe91f9c5c96f5cc053f14117f11 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Aug 2009 10:24:59 +0200 Subject: [doc/apt-mark.8.xml] improve manpage based on patch by Carl Chenet, thanks! (Closes: #510286) add also showauto and command synopsis --- debian/changelog | 2 ++ doc/apt-mark.8.xml | 48 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 841661c5a..7f8764c8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.7.22.3) unstable; urgency=low - mention the apt.conf.d dir (by Vincent McIntyre, Closes: #520831) * apt-inst/contrib/arfile.cc: - use sizeof instead strlen (by Marius Vollmer, Closes: #504325) + * doc/apt-mark.8.xml: + - improve manpage based on patch by Carl Chenet (Closes: #510286) [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 1b7b02812..f078f2de5 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; - 2 November 2007 + 9 August 2009 @@ -32,11 +32,19 @@ - apt-mark - - - markautounmarkauto - package + apt-mark + + + + + + markauto + unmarkauto + + package + + showauto + @@ -49,7 +57,8 @@ other packages are installed to satisfy its dependencies, the dependencies are marked as being automatically installed. Once these automatically installed packages are no longer depended on - by any manually installed packages, they will be removed. + by any manually installed packages, they will be removed by e.g. + apt-get or aptitude. markauto @@ -67,16 +76,24 @@ depend on it. + + showauto + showauto is used to print a + list of manually installed packages with each package on a new line. + + options - + + + - Read/Write package stats from FILENAME + Read/Write package stats from FILENAME instead of the default location, which is extended_status in the directory defined by the Configuration Item: Dir::State. @@ -101,8 +118,19 @@ + Files + + /var/lib/apt/extended_states + Status list of auto-installed packages. + Configuration Item: Dir::State + sets the path to the extended_states file. + + + + + See Also - &apt-conf; + &apt-get;,&aptitude;,&apt-conf; Diagnostics -- cgit v1.2.3-70-g09d2 From 717ec7d41a232a1571f98e1efe2ff3c71d94968f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 9 Aug 2009 13:43:21 +0200 Subject: [cmdline/apt-get.cc] correct the order of picked package binary vs source in the source command in the msg "No source package x picking y instead" --- cmdline/apt-get.cc | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 384953a6b..34ffaf11a 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1309,7 +1309,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, // show name mismatches if (IsMatch == true && Parse->Package() != Src) - ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Parse->Package().c_str(), Src.c_str()); + ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Src.c_str(), Parse->Package().c_str()); if (VerTag.empty() == false) { diff --git a/debian/changelog b/debian/changelog index 7f8764c8e..fa2a3f612 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ apt (0.7.22.3) unstable; urgency=low instead of the full package list. (Closes: #537450) - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916) - check for statfs.f_type (by Robert Millan, Closes: #509313) + - correct the order of picked package binary vs source in source * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) -- cgit v1.2.3-70-g09d2 From e85b4cd500cc96a8ce0d35c5e63fe274bed5b917 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Aug 2009 00:52:26 +0200 Subject: Add a Acquire::CompressionTypes config variable from there the acquire-items choose which compression file they should (try first to) download to easily add new or change the order of the compression types. And because it is easy now we directly add builtin lzma support. The compression ratio is better than bzip2 but we prefer the later for now as no (official) mirror uses lzma, so this would only generate useless hits on the servers. Maybe sometime in the future lzma will be the default... [apt-pkg/acquire-item.cc] - use configsettings for dynamic compression type use and order. Based on a patch by Jyrki Muukkonen, thanks! (LP: #71746) [apt-pkg/init.cc] - add default configuration for compression types and add lzma support. Order is now bzip2, lzma, gzip, none (Closes: #510526) [ftparchive/writer.cc] - add lzma support also here, patch for this (and inspiration for the one above) by Robert Millan, thanks! --- apt-pkg/acquire-item.cc | 79 ++++++++++++++++++++++++++++++------------------- apt-pkg/acquire-item.h | 10 ++----- apt-pkg/init.cc | 24 ++++++++++++++- debian/changelog | 9 ++++++ doc/apt.conf.5.xml | 15 ++++++++++ ftparchive/writer.cc | 2 ++ po/apt-all.pot | 18 +++++------ 7 files changed, 110 insertions(+), 47 deletions(-) (limited to 'debian') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 39ae327cb..ffbe66d7d 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -551,13 +551,24 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner, if(comprExt.empty()) { // autoselect the compression method - if(FileExists("/bin/bzip2")) - CompressionExtension = ".bz2"; - else - CompressionExtension = ".gz"; - } else { - CompressionExtension = (comprExt == "plain" ? "" : comprExt); + Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes"); + if (Opts != 0) + Opts = Opts->Child; + + const char dirBin[] = "Dir::Bin::"; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Tag.empty() == true || Opts->Value.empty() == true) + continue; + const string bin = _config->FindFile(string(dirBin).append(Opts->Value).c_str(),""); + if (bin != "" && !FileExists(bin)) + continue; + comprExt = '.' + Opts->Tag; + break; + } } + CompressionExtension = ((comprExt == "plain" || comprExt == ".") ? "" : comprExt); + Desc.URI = URI + CompressionExtension; Desc.Description = URIDesc; @@ -584,24 +595,32 @@ string pkgAcqIndex::Custom600Headers() /*}}}*/ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ { - bool descChanged = false; - // no .bz2 found, retry with .gz - if(Desc.URI.substr(Desc.URI.size()-3) == "bz2") { - Desc.URI = Desc.URI.substr(0,Desc.URI.size()-3) + "gz"; - - new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, - ExpectedHash, string(".gz")); - descChanged = true; - } - // no .gz found, retry with uncompressed - else if(Desc.URI.substr(Desc.URI.size()-2) == "gz") { - Desc.URI = Desc.URI.substr(0,Desc.URI.size()-2); + Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes"); + if (Opts != 0) + Opts = Opts->Child; + + const char dirBin[] = "Dir::Bin::"; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Tag.empty() == true || Opts->Value.empty() == true) + continue; + + // jump over all already checked compression types + const unsigned int nameLen = Desc.URI.size() - Opts->Tag.size(); + if(Desc.URI.substr(nameLen) != Opts->Tag || Opts->Next == 0) + continue; + + // check if we need an external binary for this compression type + const string bin = _config->FindFile(string(dirBin).append(Opts->Next->Value).c_str(),""); + if (bin != "" && !FileExists(bin)) + continue; + + // retry with the next extension + Desc.URI = Desc.URI.substr(0, nameLen) + Opts->Next->Tag; + + new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc, + ExpectedHash, string(".").append(Opts->Next->Tag)); - new pkgAcqIndex(Owner, RealURI, Desc.Description,Desc.ShortDesc, - ExpectedHash, string("plain")); - descChanged = true; - } - if (descChanged) { Status = StatDone; Complete = false; Dequeue(); @@ -698,11 +717,11 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, Local = true; string compExt = flExtension(flNotDir(URI(Desc.URI).Path)); - const char *decompProg; - if(compExt == "bz2") - decompProg = "bzip2"; - else if(compExt == "gz") - decompProg = "gzip"; + string decompProg; + + // get the binary name for your used compression type + decompProg = _config->Find(string("Acquire::CompressionTypes::").append(compExt),""); + if(decompProg.empty() == false); // flExtensions returns the full name if no extension is found // this is why we have this complicated compare operation here // FIMXE: add a new flJustExtension() that return "" if no @@ -717,9 +736,9 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, Decompression = true; DestFile += ".decomp"; - Desc.URI = string(decompProg) + ":" + FileName; + Desc.URI = decompProg + ":" + FileName; QueueURI(Desc); - Mode = decompProg; + Mode = decompProg.c_str(); } /*}}}*/ // AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/ diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index 36a926a0f..3f073de5b 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -540,7 +540,9 @@ class pkgAcqIndex : public pkgAcquire::Item * * \param compressExt The compression-related extension with which * this index file should be downloaded, or "" to autodetect - * (".bz2" is used if bzip2 is installed, ".gz" otherwise). + * Compression types can be set with config Acquire::CompressionTypes, + * default is ".lzma" or ".bz2" (if the needed binaries are present) + * fallback is ".gz" or none. */ pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc, HashString ExpectedHash, string compressExt=""); @@ -569,12 +571,6 @@ class pkgAcqIndexTrans : public pkgAcqIndex * \param URIDesc A "URI-style" description of this index file. * * \param ShortDesc A brief description of this index file. - * - * \param ExpectedHash The expected hashsum of this index file. - * - * \param compressExt The compression-related extension with which - * this index file should be downloaded, or "" to autodetect - * (".bz2" is used if bzip2 is installed, ".gz" otherwise). */ pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc, string ShortDesc); diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index 63caade36..46017bf0c 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -103,7 +103,29 @@ bool pkgInitConfig(Configuration &Cnf) if (Res == false) return false; - + + // we load all config files, now check the configs and setup post-defaults: + // * check for CompressionTypes setup + { + Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes"); + if (Opts != 0) + Opts = Opts->Child; + bool foundLzma=false, foundBzip2=false, foundGzip=false; + for (; Opts != 0; Opts = Opts->Next) + { + if (Opts->Value == "lzma") foundLzma = true; + else if (Opts->Value == "bz2") foundBzip2 = true; + else if (Opts->Value == "gz") foundGzip = true; + } + if (!foundBzip2) Cnf.Set("Acquire::CompressionTypes::bz2","bzip2"); + if (!foundLzma) Cnf.Set("Acquire::CompressionTypes::lzma","lzma"); + if (!foundGzip) Cnf.Set("Acquire::CompressionTypes::gz","gzip"); + Cnf.CndSet("Dir::Bin::lzma", "/usr/bin/lzma"); + Cnf.CndSet("Dir::Bin::bzip2", "/bin/bzip2"); + } + + + if (Cnf.FindB("Debug::pkgInitConfig",false) == true) Cnf.Dump(); diff --git a/debian/changelog b/debian/changelog index fa2a3f612..16394b067 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,15 @@ apt (0.7.22.3) unstable; urgency=low - use sizeof instead strlen (by Marius Vollmer, Closes: #504325) * doc/apt-mark.8.xml: - improve manpage based on patch by Carl Chenet (Closes: #510286) + * apt-pkg/acquire-item.cc: + - use configsettings for dynamic compression type use and order. + Based on a patch by Jyrki Muukkonen, thanks! (LP: #71746) + * apt-pkg/init.cc: + - add default configuration for compression types and add lzma + support. Order is now bzip2, lzma, gzip, none (Closes: #510526) + * ftparchive/writer.cc: + - add lzma support also here, patch for this (and inspiration for + the one above) by Robert Millan, thanks! [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 85a7d961c..d347bda67 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -303,6 +303,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; + CompressionTypes + List of compression types which are understood by the acquire methods. + Files like Packages can be available in various compression formats. + This list defines in which order the acquire methods will try to download these files. + Per default bzip2 compressed files will be prefered over + lzma, gzip and uncompressed files. The syntax for + the configuration fileentry (this option can't be set at runtime with the -o option) is + Acquire::CompressionTypes::FileExtension "Methodname"; + e.g. Acquire::CompressionTypes::bz2 "bzip2"; + Note that at runtime the Dir::Bin::Methodname will + be checked: If this setting exists the method will only be used if this file exists, e.g. for + the bzip2 method above (the inbuilt) setting is Dir::Bin::bzip2 "/bin/bzip2"; + + @@ -337,6 +351,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Binary programs are pointed to by Dir::Bin. Dir::Bin::Methods specifies the location of the method handlers and gzip, + bzip2, lzma, dpkg, apt-get dpkg-source dpkg-buildpackage and apt-cache specify the location of the respective programs. diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 9d248ab86..293e851f5 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -815,9 +815,11 @@ ReleaseWriter::ReleaseWriter(string DB) AddPattern("Packages"); AddPattern("Packages.gz"); AddPattern("Packages.bz2"); + AddPattern("Packages.lzma"); AddPattern("Sources"); AddPattern("Sources.gz"); AddPattern("Sources.bz2"); + AddPattern("Sources.lzma"); AddPattern("Release"); AddPattern("md5sum.txt"); diff --git a/po/apt-all.pot b/po/apt-all.pot index 3ec999f76..8f3d4cf60 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-09 10:20+0200\n" +"POT-Creation-Date: 2009-08-10 23:54+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2364,12 +2364,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:132 +#: apt-pkg/init.cc:154 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:148 +#: apt-pkg/init.cc:170 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2506,35 +2506,35 @@ msgstr "" msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406 +#: apt-pkg/acquire-item.cc:663 apt-pkg/acquire-item.cc:1425 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1101 +#: apt-pkg/acquire-item.cc:1120 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1211 +#: apt-pkg/acquire-item.cc:1230 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1270 +#: apt-pkg/acquire-item.cc:1289 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1311 +#: apt-pkg/acquire-item.cc:1330 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1398 +#: apt-pkg/acquire-item.cc:1417 msgid "Size mismatch" msgstr "" -- cgit v1.2.3-70-g09d2 From 83cb4069352c9e30482dcbb75a5c60de26a3cf90 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Aug 2009 01:07:54 +0200 Subject: With the introduction of the Is{Delete,Install}Ok hooks the apt flag --ignore-hold only works partly: The holds are to strongly enforced in these hooks - this commit brings the old (and expected) behaviour back. [apt-pkg/depcache.cc] - restore the --ignore-hold effect in the Is{Delete,Install}Ok hooks --- apt-pkg/depcache.cc | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 13abbe5ed..228750b74 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -823,7 +823,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge, bool pkgDepCache::IsDeleteOk(PkgIterator const &Pkg,bool rPurge, unsigned long Depth, bool FromUser) { - if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold) + if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold && _config->FindB("APT::Ignore-Hold",false) == false) { if (DebugMarker == true) std::clog << OutputInDepth(Depth) << "Hold prevents MarkDelete of " << Pkg << " FU=" << FromUser << std::endl; @@ -1085,7 +1085,7 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, bool pkgDepCache::IsInstallOk(PkgIterator const &Pkg,bool AutoInst, unsigned long Depth, bool FromUser) { - if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold) + if (FromUser == false && Pkg->SelectedState == pkgCache::State::Hold && _config->FindB("APT::Ignore-Hold",false) == false) { if (DebugMarker == true) std::clog << OutputInDepth(Depth) << "Hold prevents MarkInstall of " << Pkg << " FU=" << FromUser << std::endl; diff --git a/debian/changelog b/debian/changelog index 16394b067..0f7669930 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ apt (0.7.22.3) unstable; urgency=low * ftparchive/writer.cc: - add lzma support also here, patch for this (and inspiration for the one above) by Robert Millan, thanks! + * apt-pkg/depcache.cc: + - restore the --ignore-hold effect in the Is{Delete,Install}Ok hooks [ George Danchev ] * cmdline/apt-cache.cc: -- cgit v1.2.3-70-g09d2 From 619596fcd20e3fda2ab352103cfeb9437015dfbc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Aug 2009 13:17:36 +0200 Subject: [cmdline/apt-get.cc] - use SourceVersion instead of the BinaryVersion to get the source Patch by Matt Kraai, thanks! (Closes: #382826) --- cmdline/apt-get.cc | 5 ++- debian/changelog | 2 + po/apt-all.pot | 118 ++++++++++++++++++++++++++--------------------------- 3 files changed, 65 insertions(+), 60 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 34ffaf11a..71566fd55 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1255,7 +1255,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, //std::cout << VF.File().Archive() << std::endl; if(VF.File().Archive() && (VF.File().Archive() == DefRel)) { - VerTag = Ver.VerStr(); + pkgRecords::Parser &Parse = Recs.Lookup(VF); + VerTag = Parse.SourceVer(); + if (VerTag.empty()) + VerTag = Ver.VerStr(); break; } } diff --git a/debian/changelog b/debian/changelog index 0f7669930..3407cdcec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apt (0.7.22.3) unstable; urgency=low - ShowBroken() in build-dep (by Mike O'Connor, Closes: #145916) - check for statfs.f_type (by Robert Millan, Closes: #509313) - correct the order of picked package binary vs source in source + - use SourceVersion instead of the BinaryVersion to get the source + Patch by Matt Kraai, thanks! (Closes: #382826) * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) diff --git a/po/apt-all.pot b/po/apt-all.pot index 8f3d4cf60..767d9f060 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-10 23:54+0200\n" +"POT-Creation-Date: 2009-08-12 13:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -151,7 +151,7 @@ msgstr "" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2615 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2618 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1687 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2026 cmdline/apt-get.cc:2059 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2029 cmdline/apt-get.cc:2062 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2107 cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2110 cmdline/apt-get.cc:2359 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2202 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2205 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -775,7 +775,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2253 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2256 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -784,7 +784,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2265 msgid "Download complete and in download only mode" msgstr "" @@ -876,39 +876,39 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1312 +#: cmdline/apt-get.cc:1315 #, c-format msgid "No source package '%s' picking '%s' instead\n" msgstr "" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1352 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1362 +#: cmdline/apt-get.cc:1365 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1418 +#: cmdline/apt-get.cc:1421 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1467 +#: cmdline/apt-get.cc:1470 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1469 +#: cmdline/apt-get.cc:1472 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -#: cmdline/apt-get.cc:1470 +#: cmdline/apt-get.cc:1473 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:1478 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -924,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1478 cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1481 cmdline/apt-get.cc:1771 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1482 +#: cmdline/apt-get.cc:1485 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1501 +#: cmdline/apt-get.cc:1504 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1556 +#: cmdline/apt-get.cc:1559 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1671 cmdline/apt-get.cc:1707 +#: cmdline/apt-get.cc:1674 cmdline/apt-get.cc:1710 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1694 +#: cmdline/apt-get.cc:1697 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1725 +#: cmdline/apt-get.cc:1728 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1741 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1741 +#: cmdline/apt-get.cc:1744 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1756 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -974,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1774 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1800 +#: cmdline/apt-get.cc:1803 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:1892 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1890 +#: cmdline/apt-get.cc:1893 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1922 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1922 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1925 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1930 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1994 cmdline/apt-get.cc:2002 +#: cmdline/apt-get.cc:1997 cmdline/apt-get.cc:2005 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2102 +#: cmdline/apt-get.cc:2105 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2132 cmdline/apt-get.cc:2374 +#: cmdline/apt-get.cc:2135 cmdline/apt-get.cc:2377 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2181 +#: cmdline/apt-get.cc:2184 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2215 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2218 +#: cmdline/apt-get.cc:2221 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2224 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2230 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2258 +#: cmdline/apt-get.cc:2261 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2289 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:2301 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2299 +#: cmdline/apt-get.cc:2302 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2316 +#: cmdline/apt-get.cc:2319 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2338 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2354 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2379 +#: cmdline/apt-get.cc:2382 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2402 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2451 +#: cmdline/apt-get.cc:2454 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2504 +#: cmdline/apt-get.cc:2507 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2543 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2567 +#: cmdline/apt-get.cc:2570 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2583 +#: cmdline/apt-get.cc:2586 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2588 +#: cmdline/apt-get.cc:2591 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2620 +#: cmdline/apt-get.cc:2623 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2664 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1163,7 +1163,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2828 +#: cmdline/apt-get.cc:2831 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" -- cgit v1.2.3-70-g09d2 From ebf6c42d9db4766c315ea15f25c4a7a9a799660b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Aug 2009 14:52:43 +0200 Subject: Add the pkg/release syntax to the source command in apt-get and also add the understanding for codenames instead of archives here [cmdline/apt-get.cc] - add pkg/archive and codename in source (Closes: #414105, #441178) --- cmdline/apt-get.cc | 22 ++++++---- debian/changelog | 1 + po/apt-all.pot | 118 ++++++++++++++++++++++++++--------------------------- 3 files changed, 75 insertions(+), 66 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 71566fd55..1582fff85 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1220,17 +1220,25 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { // We want to pull the version off the package specification.. string VerTag; + string DefRel; string TmpSrc = Name; - string::size_type Slash = TmpSrc.rfind('='); + const size_t found = TmpSrc.find_last_of("/="); // honor default release - string DefRel = _config->Find("APT::Default-Release"); + if (found != string::npos && TmpSrc[found] == '/') + { + DefRel = TmpSrc.substr(found+1); + TmpSrc = TmpSrc.substr(0,found); + } + else + DefRel = _config->Find("APT::Default-Release"); + pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); - if (Slash != string::npos) + if (found != string::npos && TmpSrc[found] == '=') { - VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end()); - TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash); + VerTag = TmpSrc.substr(found+1); + TmpSrc = TmpSrc.substr(0,found); } else if(!Pkg.end() && DefRel.empty() == false) { @@ -1252,8 +1260,8 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) continue; - //std::cout << VF.File().Archive() << std::endl; - if(VF.File().Archive() && (VF.File().Archive() == DefRel)) + if((VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || + (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) { pkgRecords::Parser &Parse = Recs.Lookup(VF); VerTag = Parse.SourceVer(); diff --git a/debian/changelog b/debian/changelog index 3407cdcec..7dbbcdf7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.22.3) unstable; urgency=low - correct the order of picked package binary vs source in source - use SourceVersion instead of the BinaryVersion to get the source Patch by Matt Kraai, thanks! (Closes: #382826) + - add pkg/archive and codename in source (Closes: #414105, #441178) * apt-pkg/contrib/strutl.cc: - enable thousand separator according to the current locale (by Luca Bruno, Closes: #223712) diff --git a/po/apt-all.pot b/po/apt-all.pot index 767d9f060..b20a3fd92 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-12 13:14+0200\n" +"POT-Creation-Date: 2009-08-12 14:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -151,7 +151,7 @@ msgstr "" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2618 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2626 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1687 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1695 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2029 cmdline/apt-get.cc:2062 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2037 cmdline/apt-get.cc:2070 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2110 cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2367 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2205 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2213 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -775,7 +775,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2256 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2264 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -784,7 +784,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2265 +#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2273 msgid "Download complete and in download only mode" msgstr "" @@ -876,39 +876,39 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1315 +#: cmdline/apt-get.cc:1323 #, c-format msgid "No source package '%s' picking '%s' instead\n" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1360 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:1373 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1421 +#: cmdline/apt-get.cc:1429 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1470 +#: cmdline/apt-get.cc:1478 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1472 +#: cmdline/apt-get.cc:1480 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -#: cmdline/apt-get.cc:1473 +#: cmdline/apt-get.cc:1481 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1478 +#: cmdline/apt-get.cc:1486 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -924,49 +924,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1481 cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1489 cmdline/apt-get.cc:1779 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1493 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1504 +#: cmdline/apt-get.cc:1512 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1567 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1674 cmdline/apt-get.cc:1710 +#: cmdline/apt-get.cc:1682 cmdline/apt-get.cc:1718 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1697 +#: cmdline/apt-get.cc:1705 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1728 +#: cmdline/apt-get.cc:1736 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1741 +#: cmdline/apt-get.cc:1749 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1744 +#: cmdline/apt-get.cc:1752 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1764 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -974,152 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1782 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1803 +#: cmdline/apt-get.cc:1811 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1892 +#: cmdline/apt-get.cc:1900 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1893 +#: cmdline/apt-get.cc:1901 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1922 +#: cmdline/apt-get.cc:1930 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1925 methods/ftp.cc:702 methods/connect.cc:112 +#: cmdline/apt-get.cc:1933 methods/ftp.cc:702 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1938 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1997 cmdline/apt-get.cc:2005 +#: cmdline/apt-get.cc:2005 cmdline/apt-get.cc:2013 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2113 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2135 cmdline/apt-get.cc:2377 +#: cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2385 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:2192 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2215 +#: cmdline/apt-get.cc:2223 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2229 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2224 +#: cmdline/apt-get.cc:2232 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2238 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2261 +#: cmdline/apt-get.cc:2269 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2297 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2301 +#: cmdline/apt-get.cc:2309 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2302 +#: cmdline/apt-get.cc:2310 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:2327 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2338 +#: cmdline/apt-get.cc:2346 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2354 +#: cmdline/apt-get.cc:2362 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2382 +#: cmdline/apt-get.cc:2390 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2402 +#: cmdline/apt-get.cc:2410 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2454 +#: cmdline/apt-get.cc:2462 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2507 +#: cmdline/apt-get.cc:2515 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2543 +#: cmdline/apt-get.cc:2551 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2586 +#: cmdline/apt-get.cc:2594 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:2599 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2623 +#: cmdline/apt-get.cc:2631 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2664 +#: cmdline/apt-get.cc:2672 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1163,7 +1163,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2831 +#: cmdline/apt-get.cc:2839 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" -- cgit v1.2.3-70-g09d2 From 90c2436367d7c136467296d7726e6934bd65fe66 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 12 Aug 2009 17:13:18 +0200 Subject: [doc/apt-get.8.xml] - update the source description to reflect what it actually does and how it can be used. (Closes: #413021) --- debian/changelog | 3 +++ doc/apt-get.8.xml | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7dbbcdf7a..597ca91ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,9 @@ apt (0.7.22.3) unstable; urgency=low the one above) by Robert Millan, thanks! * apt-pkg/depcache.cc: - restore the --ignore-hold effect in the Is{Delete,Install}Ok hooks + * doc/apt-get.8.xml: + - update the source description to reflect what it actually does + and how it can be used. (Closes: #413021) [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 920f6b36e..8db2883c4 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -85,9 +85,19 @@ purge pkg source pkg - - =pkg_version_number - + + + + =pkg_version_number + + + /target_release_name + + + /target_release_codename + + + build-dep pkg @@ -240,13 +250,22 @@ 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. Source packages are - tracked separately from binary packages via deb-src type lines - in the &sources-list; file. This probably will mean that you will not - get the same source as the package you have installed or as you could - install. If the --compile options is specified then the package will be - compiled to a binary .deb using dpkg-buildpackage, if --download-only is - specified then the source package will not be unpacked. + newest available version of that source package while respect the + default release, set with the option APT::Default-Release, + the option or per package with with the + pkg/release syntax, if possible. + + Source packages are tracked separately + from binary packages via deb-src type lines + in the &sources-list; file. This means that you will need to add such a line + for each repository you want to get sources from. If you don't do this + you will properly get another (newer, older or none) source version than + the one you have installed or could install. + + If the options is specified + then the package will be compiled to a binary .deb using + dpkg-buildpackage, if + is specified then the source package will not be unpacked. A specific source version can be retrieved by postfixing the source name with an equals and then the version to fetch, similar to the mechanism -- cgit v1.2.3-70-g09d2 From dda7233c5d3879f2580543ead0ad7cd76196a160 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 18 Aug 2009 20:15:13 +0200 Subject: Allow empty Reason-Phase in the Status-Lines, which is allowed by rtf http://www.w3.org/Protocols/rfc2616/rfc2616.html . Fixed by removing a space which will now be visibly in the errormessages, but as this errors should never happen anyway and an extra space doesn't harm we don't removed it. * methods/http.cc: - allow empty Reason-Phase in Status-Line to please squid, thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) --- debian/changelog | 3 +++ methods/http.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 597ca91ff..4923f913f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,9 @@ apt (0.7.22.3) unstable; urgency=low * doc/apt-get.8.xml: - update the source description to reflect what it actually does and how it can be used. (Closes: #413021) + * methods/http.cc: + - allow empty Reason-Phase in Status-Line to please squid, + thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/methods/http.cc b/methods/http.cc index 006e89394..df62034e3 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -547,7 +547,7 @@ bool ServerState::HeaderLine(string Line) // Evil servers return no version if (Line[4] == '/') { - if (sscanf(Line.c_str(),"HTTP/%u.%u %u %[^\n]",&Major,&Minor, + if (sscanf(Line.c_str(),"HTTP/%u.%u %u%[^\n]",&Major,&Minor, &Result,Code) != 4) return _error->Error(_("The HTTP server sent an invalid reply header")); } @@ -555,7 +555,7 @@ bool ServerState::HeaderLine(string Line) { Major = 0; Minor = 9; - if (sscanf(Line.c_str(),"HTTP %u %[^\n]",&Result,Code) != 2) + if (sscanf(Line.c_str(),"HTTP %u%[^\n]",&Result,Code) != 2) return _error->Error(_("The HTTP server sent an invalid reply header")); } -- cgit v1.2.3-70-g09d2 From c6aa14e46842b0059c1648125562793e5edd08ee Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 24 Aug 2009 11:20:27 +0200 Subject: * apt-pkg/pkgcache.cc: - do not set internel "needs-configure" state for packages in triggers-pending state. dpkg will deal with the trigger and it if does it before we trigger it, dpkg will error out (LP: #414631) --- apt-pkg/pkgcache.cc | 12 ++++++------ debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2a9756c45..b0ce6e598 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -275,13 +275,13 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const return NeedsUnpack; if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured || - //we don't need to care for triggers awaiting packages - //dpkg will deal with them automatically when the - //trigger pending action is run (those packages are usually - //in half-configured or triggers-pending state) + Pkg->CurrentState == pkgCache::State::HalfConfigured) + // we leave triggers alone complettely. dpkg deals with + // them in a hard-to-predict manner and if they get + // resolved by dpkg before apt run dpkg --configure on + // the TriggersPending package dpkg returns a error //Pkg->CurrentState == pkgCache::State::TriggersAwaited - Pkg->CurrentState == pkgCache::State::TriggersPending) + //Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || diff --git a/debian/changelog b/debian/changelog index 2131b8077..6692191d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,13 @@ apt (0.7.22.3) UNRELEASED; urgency=low and '{http,ftp}_proxy' environment variables are used only if options mentioned above are not specified. (Closes: #445985, #157759, #320184, #365880, #479617) + + [ Michael Vogt ] + * apt-pkg/pkgcache.cc: + - do not set internel "needs-configure" state for packages in + triggers-pending state. dpkg will deal with the trigger and + it if does it before we trigger it, dpkg will error out + (LP: #414631) -- Michael Vogt Wed, 19 Aug 2009 11:14:15 +0200 -- cgit v1.2.3-70-g09d2 From 8c75bf9e9558d062a5f3d1fe5276aeffba6403a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 12:03:40 +0200 Subject: fix changelog entry for compression types reordering patch to reflect that we now use the new APT::Configuration class for this instead of the init.cc --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4923f913f..00afc704b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/acquire-item.cc: - use configsettings for dynamic compression type use and order. Based on a patch by Jyrki Muukkonen, thanks! (LP: #71746) - * apt-pkg/init.cc: + * apt-pkg/aptconfiguration.cc: - add default configuration for compression types and add lzma support. Order is now bzip2, lzma, gzip, none (Closes: #510526) * ftparchive/writer.cc: -- cgit v1.2.3-70-g09d2 From f0599b9c2ee704f97dbea17262107c55f527bbf0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 12:21:54 +0200 Subject: [ Nicolas François ] * doc/*.?.xml (manpages): - add contrib to author tags and also add refmiscinfo to fix warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 ++++ doc/apt-cache.8.xml | 1 + doc/apt-cdrom.8.xml | 1 + doc/apt-config.8.xml | 1 + doc/apt-extracttemplates.1.xml | 1 + doc/apt-ftparchive.1.xml | 1 + doc/apt-get.8.xml | 1 + doc/apt-key.8.xml | 1 + doc/apt-mark.8.xml | 1 + doc/apt-secure.8.xml | 1 + doc/apt-sortpkgs.1.xml | 1 + doc/apt.conf.5.xml | 1 + doc/apt.ent | 27 +++++++-------------------- doc/apt_preferences.5.xml | 1 + doc/sources.list.5.xml | 1 + 15 files changed, 24 insertions(+), 20 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4923f913f..ed2c91b0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,10 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/indexcopy.cc: - fix a memory leak then the Release file not exists (Closes: #511556) + [ Nicolas François ] + * doc/*.?.xml (manpages): + - add contrib to author tags and also add refmiscinfo to fix warnings + -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 apt (0.7.22.2) unstable; urgency=low diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 6c8938d8c..8b76f55b9 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -21,6 +21,7 @@ apt-cache 8 + APT diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index 6ab8fad9c..e57942610 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -20,6 +20,7 @@ apt-cdrom 8 + APT diff --git a/doc/apt-config.8.xml b/doc/apt-config.8.xml index 39fed5937..d4d36891f 100644 --- a/doc/apt-config.8.xml +++ b/doc/apt-config.8.xml @@ -21,6 +21,7 @@ apt-config 8 + APT diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 0f4ac04d9..77b837022 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -21,6 +21,7 @@ apt-extracttemplates 1 + APT diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index de7e5f7a3..7131303ae 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -21,6 +21,7 @@ apt-ftparchive 1 + APT diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 8db2883c4..b87e17247 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -21,6 +21,7 @@ apt-get 8 + APT diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index 4b3e7c220..7b0691b5e 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -13,6 +13,7 @@ apt-key 8 + APT diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index f078f2de5..35412d7c9 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -21,6 +21,7 @@ apt-mark 8 + APT diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 9696e018d..20f473f77 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -13,6 +13,7 @@ apt-secure 8 + APT diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 59235f115..2412260e7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -27,6 +27,7 @@ apt.conf 5 + APT diff --git a/doc/apt.ent b/doc/apt.ent index 4cfc00069..43ac2f8e5 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -158,7 +158,10 @@
apt@packages.debian.org
- Jason Gunthorpe + + Jason Gunthorpe + + 1998-2001 Jason Gunthorpe 28 October 2008 Linux @@ -176,6 +179,7 @@ Jason Gunthorpe + "> @@ -183,12 +187,14 @@ Mike O'Connor + "> APT team + "> @@ -196,25 +202,6 @@ Linux "> - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - -"> - - - APT team - -"> - Jason Gunthorpe diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index ff63f1dd3..12ea606b7 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -20,6 +20,7 @@ apt_preferences 5 + APT diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index b875086ef..c758be61f 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -21,6 +21,7 @@ sources.list 5 + APT -- cgit v1.2.3-70-g09d2 From 136f685a47b83a0bfd3e790461eab3856702a3da Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 15:52:22 +0200 Subject: * doc/Doxyfile.in: - update file with doxygen 1.6.1 (current unstable) --- debian/changelog | 2 + doc/Doxyfile.in | 1359 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 820 insertions(+), 541 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ed2c91b0e..0b0d5f87a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.22.3) unstable; urgency=low * methods/http.cc: - allow empty Reason-Phase in Status-Line to please squid, thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) + * doc/Doxyfile.in: + - update file with doxygen 1.6.1 (current unstable) [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index f19ff93f6..19f4c54cc 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,4 +1,4 @@ -# Doxyfile 1.4.5 +# Doxyfile 1.6.1 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,536 +14,664 @@ # Project related configuration options #--------------------------------------------------------------------------- -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = @PACKAGE@ -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = @VERSION@ -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. OUTPUT_DIRECTORY = ../build/doc/doxygen -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, -# Swedish, and Ukrainian. +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = NO - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = NO -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = YES -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) -MULTILINE_CPP_IS_BRIEF = NO +QT_AUTOBRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. -DETAILS_AT_TOP = NO +MULTILINE_CPP_IS_BRIEF = NO -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = YES -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = NO -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = YES -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_MEMBERS = NO -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. HIDE_UNDOC_CLASSES = NO -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = YES -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = YES -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = NO -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = YES -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = YES -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is YES. +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. SHOW_DIRECTORIES = YES -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = NO -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = ../apt-pkg -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.cc \ *.h -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = YES -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO @@ -552,46 +680,54 @@ FILTER_SOURCE_FILES = NO # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = YES @@ -600,279 +736,393 @@ VERBATIM_HEADERS = YES # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -HTML_STYLESHEET = +HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. ENUM_VALUES_PER_LINE = 4 -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) +# there is already a search function so this one should typically +# be disabled. + +SEARCHENGINE = NO + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = YES -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO +# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -881,33 +1131,33 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = NO -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -916,10 +1166,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -928,311 +1178,338 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse # the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more # powerful graphs. CLASS_DIAGRAMS = YES -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = @HAVE_DOT@ -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = NO -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. CALL_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen # will graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. DOT_PATH = @DOTDIR@ -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. -MAX_DOT_GRAPH_WIDTH = 1024 +DOT_GRAPH_MAX_NODES = 50 -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that a graph may be further truncated if the graph's -# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH -# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), -# the graph is not depth-constrained. +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. MAX_DOT_GRAPH_DEPTH = 0 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = NO -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO -- cgit v1.2.3-70-g09d2 From a6f7fd36c8b456651568fecac6a29bbd7f4f0e7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 16:02:39 +0200 Subject: * doc/Doxyfile.in - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 The description for this option is: # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. Even oldstable has a newer dot version, so the debian package doxygen activate it per default and we will follow this recommendation now. --- debian/changelog | 1 + doc/Doxyfile.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b0d5f87a..0230e16ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ apt (0.7.22.3) unstable; urgency=low thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) * doc/Doxyfile.in: - update file with doxygen 1.6.1 (current unstable) + - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 19f4c54cc..43d961443 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1500,7 +1500,7 @@ DOT_TRANSPARENT = NO # makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. -DOT_MULTI_TARGETS = NO +DOT_MULTI_TARGETS = YES # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will # generate a legend page explaining the meaning of the various boxes and -- cgit v1.2.3-70-g09d2 From f30c4b6adaa6729630b15a354569ecbae92ec9a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 16:38:54 +0200 Subject: [ Nicolas François ] * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak: - fix a few typos in the comments of this files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildlib/defaults.mak | 22 +++++++++++----------- buildlib/manpage.mak | 2 +- debian/changelog | 2 ++ doc/style.txt | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index a171522d5..8c57da05b 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -6,26 +6,26 @@ # for it to operate as expected. When included the module generates # the requested rules based on the contents of its control variables. -# This works out very well and allows a good degree of flexability. -# To accomidate some of the features we introduce the concept of +# This works out very well and allows a good degree of flexibility. +# To accommodate some of the features we introduce the concept of # local variables. To do this we use the 'Computed Names' feature of # gmake. Each module declares a LOCAL scope and access it with, # $($(LOCAL)-VAR) -# This works very well but it is important to rembember that within -# a rule the LOCAL var is unavailble, it will have to be constructed -# from the information in the rule invokation. For stock rules like +# This works very well but it is important to remember that within +# a rule the LOCAL var is unavailable, it will have to be constructed +# from the information in the rule invocation. For stock rules like # clean this is simple, we use a local clean rule called clean/$(LOCAL) # and then within the rule $(@F) gets back $(LOCAL)! Other rules will # have to use some other mechanism (filter perhaps?) The reason such # lengths are used is so that each directory can contain several 'instances' # of any given module. I notice that the very latest gmake has the concept # of local variables for rules. It is possible this feature in conjunction -# with the generated names will provide a very powerfull solution indeed! +# with the generated names will provide a very powerful solution indeed! # A build directory is used by default, all generated items get put into # there. However unlike automake this is not done with a VPATH build # (vpath builds break the distinction between #include "" and #include <>) -# but by explicly setting the BUILD variable. Make is invoked from +# but by explicitly setting the BUILD variable. Make is invoked from # within the source itself which is much more compatible with compilation # environments. ifndef NOISY @@ -99,12 +99,12 @@ endif # Source location control # SUBDIRS specifies sub components of the module that -# may be located in subdrictories of the source dir. +# may be located in subdirectories of the source dir. # This should be declared before including this file SUBDIRS+= # Header file control. -# TARGETDIRS indicitates all of the locations that public headers +# TARGETDIRS indicates all of the locations that public headers # will be published to. # This should be declared before including this file HEADER_TARGETDIRS+= @@ -133,7 +133,7 @@ dirs: mkdir -p $(patsubst %/,%,$(sort $(MKDIRS))) # Header file control. We want all published interface headers to go -# into the build directory from thier source dirs. We setup some +# into the build directory from their source dirs. We setup some # search paths here vpath %.h $(SUBDIRS) $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) : %.h @@ -142,7 +142,7 @@ $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) : # Dependency generation. We want to generate a .d file using gnu cpp. # For GNU systems the compiler can spit out a .d file while it is compiling, # this is specified with the INLINEDEPFLAG. Other systems might have a -# makedep program that can be called after compiling, that's illistrated +# makedep program that can be called after compiling, that's illustrated # by the DEPFLAG case. # Compile rules are expected to call this macro after calling the compiler ifdef GCC3DEP diff --git a/buildlib/manpage.mak b/buildlib/manpage.mak index 1f2644c01..6cdf73ccf 100644 --- a/buildlib/manpage.mak +++ b/buildlib/manpage.mak @@ -5,7 +5,7 @@ # Input # $(SOURCE) - The documents to use -# All output is writtin to files in the build doc directory +# All output is written to files in the build doc directory # See defaults.mak for information about LOCAL diff --git a/debian/changelog b/debian/changelog index 0230e16ff..35ce8b7dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,8 @@ apt (0.7.22.3) unstable; urgency=low [ Nicolas François ] * doc/*.?.xml (manpages): - add contrib to author tags and also add refmiscinfo to fix warnings + * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak: + - fix a few typos in the comments of this files -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 diff --git a/doc/style.txt b/doc/style.txt index 8d0778b4a..2072251d0 100644 --- a/doc/style.txt +++ b/doc/style.txt @@ -17,8 +17,8 @@ this style are: Each file gets a block at the top that should describe what the file does, basically a summary of purpose along with any special notes and attributions. The }}} and {{{ are folding marks if you have a folding -editor such as jed, the function seperators are intended to give -a visual seperate between functions for easier browsing of the larger files, +editor such as jed, the function separators are intended to give +a visual separate between functions for easier browsing of the larger files, or indexed folding if you have such an editor. Each file should have 1 or 0 primary include files, that include @@ -71,5 +71,5 @@ almost always designates a change in ownership rules). pointer is an 'input' parameter (designated generally by an =0, indicating a default of 'none') -Non-ownership transfering arrays/lists should probably return an iterator +Non-ownership transferring arrays/lists should probably return an iterator typedef or references.. -- cgit v1.2.3-70-g09d2 From 2a52e8c56b71fa894c52ff93d6b98c39c00dc4e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 17:23:58 +0200 Subject: [ Nicolas François ] * Cleaned up the first patch draft from KURASAWA Nozomu to finally get po4a support for translating the man pages. Many thanks to both for this excellent work! (Closes: #441608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/apt-utils.manpages | 6 - debian/apt.manpages | 33 - debian/changelog | 3 + debian/control | 2 +- debian/rules | 6 +- doc/makefile | 27 +- doc/po/apt-doc.pot | 6430 +++++++++++++++++++++++++++++++++++++++++++++ doc/po4a.conf | 50 + 8 files changed, 6504 insertions(+), 53 deletions(-) delete mode 100644 debian/apt-utils.manpages delete mode 100644 debian/apt.manpages create mode 100644 doc/po/apt-doc.pot create mode 100644 doc/po4a.conf (limited to 'debian') diff --git a/debian/apt-utils.manpages b/debian/apt-utils.manpages deleted file mode 100644 index a68e909fc..000000000 --- a/debian/apt-utils.manpages +++ /dev/null @@ -1,6 +0,0 @@ -doc/apt-extracttemplates.1 -doc/apt-ftparchive.1 -doc/apt-sortpkgs.1 -doc/fr/apt-extracttemplates.fr.1 -doc/fr/apt-ftparchive.fr.1 -doc/fr/apt-sortpkgs.fr.1 diff --git a/debian/apt.manpages b/debian/apt.manpages deleted file mode 100644 index 3c9c8a460..000000000 --- a/debian/apt.manpages +++ /dev/null @@ -1,33 +0,0 @@ -doc/apt-cache.8 -doc/apt-cdrom.8 -doc/apt-config.8 -doc/apt-get.8 -doc/apt-key.8 -doc/apt-mark.8 -doc/apt-secure.8 -doc/apt.8 -doc/apt.conf.5 -doc/apt_preferences.5 -doc/fr/apt-cache.fr.8 -doc/fr/apt-cdrom.fr.8 -doc/fr/apt-config.fr.8 -doc/fr/apt-get.fr.8 -doc/fr/apt-key.fr.8 -doc/fr/apt.conf.fr.5 -doc/fr/apt_preferences.fr.5 -doc/fr/sources.list.fr.5 -doc/es/apt-cache.es.8 -doc/es/apt-cdrom.es.8 -doc/es/apt-config.es.8 -doc/es/apt-get.es.8 -doc/es/apt.conf.es.5 -doc/es/apt_preferences.es.5 -doc/es/sources.list.es.5 -doc/es/apt.es.8 -doc/pt_BR/apt_preferences.pt_BR.5 -doc/ja/apt-cache.ja.8 -doc/ja/apt-cdrom.ja.8 -doc/ja/apt-get.ja.8 -doc/ja/apt.conf.ja.5 -doc/sources.list.5 -doc/de/apt.de.8 diff --git a/debian/changelog b/debian/changelog index 35ce8b7dd..e279633fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,9 @@ apt (0.7.22.3) unstable; urgency=low - fix a memory leak then the Release file not exists (Closes: #511556) [ Nicolas François ] + * Cleaned up the first patch draft from KURASAWA Nozomu to finally + get po4a support for translating the man pages. + Many thanks to both for this excellent work! (Closes: #441608) * doc/*.?.xml (manpages): - add contrib to author tags and also add refmiscinfo to fix warnings * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak: diff --git a/debian/control b/debian/control index cb20e2864..bcf89da9b 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode Standards-Version: 3.8.2.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2) Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt diff --git a/debian/rules b/debian/rules index f1eb62b57..d19531dfc 100755 --- a/debian/rules +++ b/debian/rules @@ -186,6 +186,7 @@ apt-doc: build-doc # Build architecture-dependent files here. binary-arch: 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 debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ @@ -226,7 +227,7 @@ apt: build build-doc debian/shlibs.local rm -f po/*.pot dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installman -p$@ + dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ dh_installdocs -p$@ dh_installchangelogs -p$@ @@ -269,6 +270,7 @@ libapt-pkg-dev: build debian/shlibs.local dh_md5sums -p$@ dh_builddeb -p$@ +apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates apt-utils: build debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ @@ -284,7 +286,7 @@ apt-utils: build debian/shlibs.local dh_installexamples -p$@ # Install the man pages.. - dh_installman -p$@ + dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ diff --git a/doc/makefile b/doc/makefile index 6ea1c1343..e12de7228 100644 --- a/doc/makefile +++ b/doc/makefile @@ -26,22 +26,27 @@ TARGET = binary include $(COPY_H) #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr -doc: doc.fr doc.ja doc.pl doc.pt_BR doc.es +doc: po4a + for dir in $(SUBDIRS); do\ + $(MAKE) -C $$dir $@; \ + done -doc.fr: %.fr: - $(MAKE) -C fr $* +.PHONY: update-po po4a +update-po: + po4a --previous --no-backups --force --no-translations po4a.conf -doc.pt_BR: %.pt_BR: - $(MAKE) -C pt_BR $* +clean: po4a-clean clean-subdirs -doc.es: %.es: - $(MAKE) -C es $* +clean-subdirs: + for dir in $(SUBDIRS); do\ + $(MAKE) -C $$dir $@; \ + done -doc.ja: %.ja: - $(MAKE) -C ja $* +po4a-clean: + po4a --previous --rm-backups --rm-translations po4a.conf -doc.pl: %.pl: - $(MAKE) -C pl $* +po4a: + po4a --previous --no-backups po4a.conf ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot new file mode 100644 index 000000000..ff42c7ee9 --- /dev/null +++ b/doc/po/apt-doc.pot @@ -0,0 +1,6430 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2009-07-30 22:55+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: ENCODING" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "apt" +msgstr "" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "16 June 1998" +msgstr "" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "Debian GNU/Linux" +msgstr "" + +#. type: SH +#: apt.8:18 +#, no-wrap +msgid "NAME" +msgstr "" + +#. type: Plain text +#: apt.8:20 +msgid "apt - Advanced Package Tool" +msgstr "" + +#. type: SH +#: apt.8:20 +#, no-wrap +msgid "SYNOPSIS" +msgstr "" + +#. type: Plain text +#: apt.8:22 +msgid "B" +msgstr "" + +#. type: SH +#: apt.8:22 +#, no-wrap +msgid "DESCRIPTION" +msgstr "" + +#. type: Plain text +#: apt.8:31 +msgid "" +"APT is a management system for software packages. For normal day to day " +"package management there are several frontends available, such as " +"B(8) for the command line or B(8) for the X Window " +"System. Some options are only implemented in B(8) though." +msgstr "" + +#. type: SH +#: apt.8:31 +#, no-wrap +msgid "OPTIONS" +msgstr "" + +#. type: Plain text +#: apt.8:33 apt.8:35 +msgid "None." +msgstr "" + +#. type: SH +#: apt.8:33 +#, no-wrap +msgid "FILES" +msgstr "" + +#. type: SH +#: apt.8:35 +#, no-wrap +msgid "SEE ALSO" +msgstr "" + +#. type: Plain text +#: apt.8:42 +msgid "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" +msgstr "" + +#. type: SH +#: apt.8:42 +#, no-wrap +msgid "DIAGNOSTICS" +msgstr "" + +#. type: Plain text +#: apt.8:44 +msgid "apt returns zero on normal operation, decimal 100 on error." +msgstr "" + +#. type: SH +#: apt.8:44 +#, no-wrap +msgid "BUGS" +msgstr "" + +#. type: Plain text +#: apt.8:46 +msgid "This manpage isn't even started." +msgstr "" + +#. type: Plain text +#: apt.8:55 +msgid "" +"See Ehttp://bugs.debian.org/aptE. If you wish to report a bug in " +"B, please see I or the " +"B(1) command." +msgstr "" + +#. type: SH +#: apt.8:55 +#, no-wrap +msgid "AUTHOR" +msgstr "" + +#. type: Plain text +#: apt.8:56 +msgid "apt was written by the APT team Eapt@packages.debian.orgE." +msgstr "" + +#. type: Plain text +#: apt.ent:2 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:10 +msgid "" +" " +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " +msgstr "" + +#. type: Plain text +#: apt.ent:17 +#, no-wrap +msgid "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:23 +#, no-wrap +msgid "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:29 +#, no-wrap +msgid "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:35 +#, no-wrap +msgid "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:41 +#, no-wrap +msgid "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:47 +#, no-wrap +msgid "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:53 +#, no-wrap +msgid "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:59 +#, no-wrap +msgid "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:65 +#, no-wrap +msgid "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:72 +#, no-wrap +msgid "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:78 +#, no-wrap +msgid "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:84 +#, no-wrap +msgid "" +"\n" +" dpkg\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:90 +#, no-wrap +msgid "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:96 +#, no-wrap +msgid "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:102 +#, no-wrap +msgid "" +"\n" +" dpkg-scanpackages\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:108 +#, no-wrap +msgid "" +"\n" +" dpkg-scansources\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:114 +#, no-wrap +msgid "" +"\n" +" dselect\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:120 +#, no-wrap +msgid "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:126 +#, no-wrap +msgid "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:132 +#, no-wrap +msgid "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:138 +#, no-wrap +msgid "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:144 +#, no-wrap +msgid "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:150 +#, no-wrap +msgid "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:156 +#, no-wrap +msgid "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:165 +#, no-wrap +msgid "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" Jason " +"Gunthorpe\n" +" 1998-2001 Jason " +"Gunthorpe\n" +" 28 October 2008\n" +" Linux\n" +msgstr "" + +#. type: Plain text +#: apt.ent:168 +#, no-wrap +msgid "" +" \n" +"\"> \n" +msgstr "" + +#. type: Plain text +#: apt.ent:174 apt.ent:204 +#, no-wrap +msgid "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:181 apt.ent:211 +#, no-wrap +msgid "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:188 +#, no-wrap +msgid "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:194 apt.ent:217 +#, no-wrap +msgid "" +"\n" +" APT team\n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:198 apt.ent:228 +#, no-wrap +msgid "" +"Linux\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:224 +#, no-wrap +msgid "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:234 +#, no-wrap +msgid "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:245 +#, no-wrap +msgid "" +"\n" +"Bugs\n" +" APT bug " +"page. \n" +" If you wish to report a bug in APT, please see\n" +" /usr/share/doc/debian/bug-reporting.txt or the\n" +" &reportbug; command.\n" +" \n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:253 +#, no-wrap +msgid "" +"\n" +"Author\n" +" APT was written by the APT team " +"apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:263 +#, no-wrap +msgid "" +"\n" +"\n" +" \n" +" Show a short usage summary.\n" +" \n" +" \n" +" \n" +msgstr "" + +#. type: Plain text +#: apt.ent:271 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Show the program version.\n" +" \n" +" \n" +" \n" +msgstr "" + +#. type: Plain text +#: apt.ent:281 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Configuration File; Specify a configuration file to " +"use. \n" +" The program will read the default configuration file and then this \n" +" configuration file. See &apt-conf; for syntax information. \n" +" \n" +" \n" +" \n" +msgstr "" + +#. type: Plain text +#: apt.ent:293 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Set a Configuration Option; This will set an " +"arbitrary\n" +" configuration option. The syntax is .\n" +" and can be used " +"multiple\n" +" times to set different options.\n" +" \n" +" \n" +" \n" +"\">\n" +msgstr "" + +#. type: Plain text +#: apt.ent:304 +#, no-wrap +msgid "" +"\n" +"All command line options may be set using the configuration file, " +"the\n" +" descriptions indicate the configuration option to set. For boolean\n" +" options you can override the config file by using something like \n" +" ,, \n" +" or several other variations.\n" +" \n" +"\">\n" +msgstr "" + +#. The last update date +#. type: Content of: +#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" +msgstr "" + +#. type: Content of: +#: apt-cache.8.xml:22 apt-cache.8.xml:28 +msgid "apt-cache" +msgstr "" + +#. type: Content of: +#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 +msgid "8" +msgstr "" + +#. type: Content of: +#: apt-cache.8.xml:29 +msgid "APT package handling utility -- cache manipulator" +msgstr "" + +#. type: Content of: +#: apt-cache.8.xml:35 +msgid "" +"apt-cache " +" " +" add file " +"gencaches showpkg pkg showsrc pkg " +"stats dump dumpavail unmet " +"search regex show pkg " +"depends pkg rdepends pkg " +"pkgnames prefix dotty " +"pkg xvcg pkg " +"policy pkgs madison pkgs " +"" +msgstr "" + +#. type: Content of: +#: apt-cache.8.xml:61 apt-cdrom.8.xml:46 apt-config.8.xml:46 apt-extracttemplates.1.xml:42 apt-ftparchive.1.xml:54 apt-get.8.xml:114 apt-key.8.xml:33 apt-mark.8.xml:43 apt-secure.8.xml:39 apt-sortpkgs.1.xml:43 apt.conf.5.xml:38 apt_preferences.5.xml:32 sources.list.5.xml:32 +msgid "Description" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:62 +msgid "" +"<command>apt-cache</command> performs a variety of operations on APT's " +"package cache. <command>apt-cache</command> does not manipulate the state of " +"the system but does provide operations to search and generate interesting " +"output from the package metadata." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:67 apt-get.8.xml:120 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given, " +"one of the commands below must be present." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:71 +msgid "add <replaceable>file(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:72 +msgid "" +"<literal>add</literal> adds the named package index files to the package " +"cache. This is for debugging only." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:76 +msgid "gencaches" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:77 +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 "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:83 +msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:84 +msgid "" +"<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 well " +"as forward dependencies for each version. Forward (normal) dependencies are " +"those packages upon which the package in question depends; reverse " +"dependencies are those packages that depend upon the package in " +"question. Thus, forward dependencies must be satisfied for a package, but " +"reverse dependencies need not be. For instance, <command>apt-cache showpkg " +"libreadline2</command> would produce output similar to the following:" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-cache.8.xml:96 +#, no-wrap +msgid "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:108 +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, " +"libreadlineg2 and libreadline2-altdev depend on libreadline2. If " +"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be " +"installed; libreadlineg2 and libreadline2-altdev do not have to be " +"installed. For the specific meaning of the remainder of the output it is " +"best to consult the apt source code." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:117 +msgid "stats" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:117 +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:120 +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:124 +msgid "" +"<literal>Normal packages</literal> is the number of regular, ordinary " +"package names; these are packages that bear a one-to-one correspondence " +"between their names and the names used by other packages for them in " +"dependencies. The majority of packages fall into this category." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:130 +msgid "" +"<literal>Pure virtual packages</literal> is the number of packages that " +"exist only as a virtual package name; that is, packages only \"provide\" the " +"virtual package name, and no package actually uses the name. For instance, " +"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " +"package; several packages provide \"mail-transport-agent\", but there is no " +"package named \"mail-transport-agent\"." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:138 +msgid "" +"<literal>Single virtual packages</literal> is the number of packages with " +"only one package providing a particular virtual package. For example, in the " +"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " +"one package, xless, provides \"X11-text-viewer\"." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:144 +msgid "" +"<literal>Mixed virtual packages</literal> is the number of packages that " +"either provide a particular virtual package or have the virtual package name " +"as the package name. For instance, in the Debian GNU/Linux system, " +"\"debconf\" is both an actual package, and provided by the debconf-tiny " +"package." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:151 +msgid "" +"<literal>Missing</literal> is the number of package names that were " +"referenced in a dependency but were not provided by any package. Missing " +"packages may be in evidence if a full distribution is not accessed, or if a " +"package (real or virtual) has been dropped from the distribution. Usually " +"they are referenced from Conflicts or Breaks statements." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:158 +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 " +"total package names. If more than one distribution (both \"stable\" and " +"\"unstable\", for instance), is being accessed, this value can be " +"considerably larger than the number of total package names." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:165 +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:172 +msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:173 +msgid "" +"<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." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:178 apt-config.8.xml:83 +msgid "dump" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:179 +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:183 +msgid "dumpavail" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:184 +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:188 +msgid "unmet" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:189 +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:193 +msgid "show <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:194 +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:199 +msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:200 +msgid "" +"<literal>search</literal> performs a full text search on all available " +"package lists for the POSIX regex pattern given, see " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " +"the descriptions for an occurrence of the regular expression and prints out " +"the package name and the short description, including virtual package " +"names. If <option>--full</option> is given then output identical to " +"<literal>show</literal> is produced for each matched package, and if " +"<option>--names-only</option> is given then the long description is not " +"searched, only the package name is." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:213 +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:217 +msgid "depends <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:218 +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:222 +msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:223 +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:227 +msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:228 +msgid "" +"This command prints the name of each package in the system. The optional " +"argument is a prefix match to filter the name list. The output is suitable " +"for use in a shell tab complete function and the output is generated " +"extremely quickly. This command is best used with the " +"<option>--generate</option> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:235 +msgid "dotty <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:236 +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.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> " +"package. The result will be a set of nodes and edges representing the " +"relationships between the packages. By default the given packages will trace " +"out all dependent packages; this can produce a very large graph. To limit " +"the output to only the packages listed on the command line, set the " +"<literal>APT::Cache::GivenOnly</literal> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:245 +msgid "" +"The resulting nodes will have several shapes; normal packages are boxes, " +"pure provides are triangles, mixed provides are diamonds, missing packages " +"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " +"lines are pre-depends, green lines are conflicts." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:250 +msgid "Caution, dotty cannot graph larger sets of packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:253 +msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:254 +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:258 +msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:259 +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 " +"source. Otherwise it prints out detailed information about the priority " +"selection of the named package." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:265 +msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:266 +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 " +"archive management tool, <literal>madison</literal>. It displays available " +"versions of a package in a tabular format. Unlike the original " +"<literal>madison</literal>, it can only display information for the " +"architecture for which APT has retrieved package lists " +"(<literal>APT::Architecture</literal>)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:277 apt-config.8.xml:92 apt-extracttemplates.1.xml:55 apt-ftparchive.1.xml:491 apt-get.8.xml:299 apt-mark.8.xml:73 apt-sortpkgs.1.xml:53 apt.conf.5.xml:373 apt.conf.5.xml:395 +msgid "options" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 +msgid "<option>-p</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 +msgid "<option>--pkg-cache</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:282 +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::pkgcache</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:287 apt-ftparchive.1.xml:534 apt-get.8.xml:356 apt-sortpkgs.1.xml:57 +msgid "<option>-s</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:287 +msgid "<option>--src-cache</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:288 +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 " +"information from remote sources. When building the package cache the source " +"cache is used to avoid reparsing all of the package files. Configuration " +"Item: <literal>Dir::Cache::srcpkgcache</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346 +msgid "<option>-q</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346 +msgid "<option>--quiet</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:296 +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 " +"<option>-q=#</option> to set the quietness level, overriding the " +"configuration file. Configuration Item: <literal>quiet</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:302 +msgid "<option>-i</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:302 +msgid "<option>--important</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:303 +msgid "" +"Print only important dependencies; for use with unmet and depends. Causes " +"only Depends and Pre-Depends relations to be printed. Configuration Item: " +"<literal>APT::Cache::Important</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:308 apt-cdrom.8.xml:120 apt-get.8.xml:313 +msgid "<option>-f</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:308 +msgid "<option>--full</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:309 +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:313 apt-cdrom.8.xml:130 +msgid "<option>-a</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:313 +msgid "<option>--all-versions</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:314 +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-versions</option> is specified, only the candidate version " +"will displayed (the one which would be selected for installation). This " +"option is only applicable to the <literal>show</literal> command. " +"Configuration Item: <literal>APT::Cache::AllVersions</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:322 +msgid "<option>-g</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:322 +msgid "<option>--generate</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:323 +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</option>. Configuration Item: " +"<literal>APT::Cache::Generate</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:328 +msgid "<option>--names-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:328 apt-cdrom.8.xml:138 +msgid "<option>-n</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:329 +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:333 +msgid "<option>--all-names</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:334 +msgid "" +"Make <literal>pkgnames</literal> print all names, including virtual packages " +"and missing dependencies. Configuration Item: " +"<literal>APT::Cache::AllNames</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:339 +msgid "<option>--recurse</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:340 +msgid "" +"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " +"that all packages mentioned are printed once. Configuration Item: " +"<literal>APT::Cache::RecurseDepends</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:345 +msgid "<option>--installed</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:347 +msgid "" +"Limit the output of <literal>depends</literal> and " +"<literal>rdepends</literal> to packages which are currently installed. " +"Configuration Item: <literal>APT::Cache::Installed</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:352 apt-cdrom.8.xml:149 apt-config.8.xml:97 apt-extracttemplates.1.xml:66 apt-ftparchive.1.xml:546 apt-get.8.xml:534 apt-sortpkgs.1.xml:63 +msgid "&apt-commonoptions;" +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:357 apt-get.8.xml:539 apt-key.8.xml:137 apt.conf.5.xml:824 +msgid "Files" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:359 apt-get.8.xml:541 +msgid "<filename>/etc/apt/sources.list</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:360 apt-get.8.xml:542 +msgid "" +"Locations to fetch packages from. Configuration Item: " +"<literal>Dir::Etc::SourceList</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:364 apt-get.8.xml:575 +msgid "<filename>&statedir;/lists/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:365 apt-get.8.xml:576 +msgid "" +"Storage area for state information for each package resource specified in " +"&sources-list; Configuration Item: <literal>Dir::State::Lists</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:370 apt-get.8.xml:581 +msgid "<filename>&statedir;/lists/partial/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:371 apt-get.8.xml:582 +msgid "" +"Storage area for state information in transit. Configuration Item: " +"<literal>Dir::State::Lists</literal> (implicit partial)." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:377 apt-cdrom.8.xml:154 apt-config.8.xml:102 apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:562 apt-get.8.xml:588 apt-key.8.xml:161 apt-mark.8.xml:104 apt-secure.8.xml:180 apt-sortpkgs.1.xml:68 apt.conf.5.xml:828 apt_preferences.5.xml:613 sources.list.5.xml:220 +msgid "See Also" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:378 +msgid "&apt-conf;, &sources-list;, &apt-get;" +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:382 apt-cdrom.8.xml:159 apt-config.8.xml:107 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:566 apt-get.8.xml:594 apt-mark.8.xml:108 apt-sortpkgs.1.xml:72 +msgid "Diagnostics" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:383 +msgid "" +"<command>apt-cache</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" + +#. type: Content of: <refentry><refentryinfo> +#: apt-cdrom.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:27 +msgid "apt-cdrom" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-cdrom.8.xml:28 +msgid "APT CDROM management utility" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-cdrom.8.xml:34 +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 "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:47 +msgid "" +"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"available sources. <command>apt-cdrom</command> takes care of determining " +"the structure of the disc as well as correcting for several possible " +"mis-burns and verifying the index files." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:54 +msgid "" +"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " +"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"must be inserted and scanned separately to account for possible mis-burns." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:64 +msgid "add" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:65 +msgid "" +"<literal>add</literal> is used to add a new disc to the source list. It will " +"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"to scan it and copy the index files. If the disc does not have a proper " +"<filename>disk</filename> directory you will be prompted for a descriptive " +"title." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:73 +msgid "" +"APT uses a CDROM ID to track which disc is currently in the drive and " +"maintains a database of these IDs in " +"<filename>&statedir;/cdroms.list</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:80 +msgid "ident" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:81 +msgid "" +"A debugging tool to report the identity of the current disc as well as the " +"stored file name" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:60 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present. <placeholder " +"type=\"variablelist\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cdrom.8.xml:90 +msgid "Options" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:94 apt-ftparchive.1.xml:502 apt-get.8.xml:308 +msgid "<option>-d</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:94 +msgid "<option>--cdrom</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:95 +msgid "" +"Mount point; specify the location to mount the cdrom. This mount point must " +"be listed in <filename>/etc/fstab</filename> and properly configured. " +"Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:103 +msgid "<option>-r</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:103 +msgid "<option>--rename</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:104 +msgid "" +"Rename a disc; change the label of a disk or override the disks given " +"label. This option will cause <command>apt-cdrom</command> to prompt for a " +"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:112 apt-get.8.xml:327 +msgid "<option>-m</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:112 +msgid "<option>--no-mount</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:113 +msgid "" +"No mounting; prevent <command>apt-cdrom</command> from mounting and " +"unmounting the mount point. Configuration Item: " +"<literal>APT::CDROM::NoMount</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:120 +msgid "<option>--fast</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:121 +msgid "" +"Fast Copy; Assume the package files are valid and do not check every " +"package. This option should be used only if <command>apt-cdrom</command> has " +"been run on this disc before and did not detect any errors. Configuration " +"Item: <literal>APT::CDROM::Fast</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:130 +msgid "<option>--thorough</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:131 +msgid "" +"Thorough Package Scan; This option may be needed with some old Debian " +"1.1/1.2 discs that have Package files in strange places. It takes much " +"longer to scan the CD but will pick them all up." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:139 apt-get.8.xml:358 +msgid "<option>--just-print</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:140 apt-get.8.xml:360 +msgid "<option>--recon</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:141 apt-get.8.xml:361 +msgid "<option>--no-act</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:142 +msgid "" +"No Changes; Do not change the &sources-list; file and do not write index " +"files. Everything is still checked however. Configuration Item: " +"<literal>APT::CDROM::NoAct</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:155 +msgid "&apt-conf;, &apt-get;, &sources-list;" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:160 +msgid "" +"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-config.8.xml:22 apt-config.8.xml:28 +msgid "apt-config" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-config.8.xml:29 +msgid "APT Configuration Query program" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-config.8.xml:35 +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 "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:47 +msgid "" +"<command>apt-config</command> is an internal program used by various " +"portions of the APT suite to provide consistent configurability. It accesses " +"the main configuration file <filename>/etc/apt/apt.conf</filename> in a " +"manner that is easy to use by scripted applications." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:52 apt-ftparchive.1.xml:70 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:57 +msgid "shell" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:59 +msgid "" +"shell is used to access the configuration information from a shell " +"script. It is given pairs of arguments, the first being a shell variable and " +"the second the configuration value to query. As output it lists a series of " +"shell assignments commands for each present value. In a shell script it " +"should be used like:" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-config.8.xml:67 +#, no-wrap +msgid "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:72 +msgid "" +"This will set the shell environment variable $OPTS to the value of " +"MyApp::options with a default of <option>-f</option>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:76 +msgid "" +"The configuration item may be postfixed with a /[fdbi]. f returns file " +"names, d returns directories, b returns true or false and i returns an " +"integer. Each of the returns is normalized and verified internally." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:85 +msgid "Just show the contents of the configuration space." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-mark.8.xml:105 apt-sortpkgs.1.xml:69 +msgid "&apt-conf;" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:108 +msgid "" +"<command>apt-config</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:28 +msgid "apt-extracttemplates" +msgstr "" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 +msgid "1" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-extracttemplates.1.xml:29 +msgid "Utility to extract DebConf config and templates from Debian packages" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-extracttemplates.1.xml:35 +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 "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:43 +msgid "" +"<command>apt-extracttemplates</command> will take one or more Debian package " +"files as input and write out (to a temporary directory) all associated " +"config scripts and template files. For each passed in package that contains " +"config scripts and templates, one line of output will be generated in the " +"format:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:48 +msgid "package version template-file config-script" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:49 +msgid "" +"template-file and config-script are written to the temporary directory " +"specified by the -t or --tempdir " +"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with " +"filenames of the form <filename>package.template.XXXX</filename> and " +"<filename>package.config.XXXX</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:59 apt-get.8.xml:468 +msgid "<option>-t</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:59 +msgid "<option>--tempdir</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-extracttemplates.1.xml:61 +msgid "" +"Temporary directory in which to write extracted debconf template files and " +"config scripts Configuration Item: " +"<literal>APT::ExtractTemplates::TempDir</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:78 +msgid "" +"<command>apt-extracttemplates</command> returns zero on normal operation, " +"decimal 100 on error." +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:28 +msgid "apt-ftparchive" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-ftparchive.1.xml:29 +msgid "Utility to generate index files" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-ftparchive.1.xml:35 +msgid "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> " +"<arg><option>--contents</option></arg> <arg><option>-o=<replaceable>config " +"string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +"choice=\"req\"> <arg>packages<arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg " +"choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>release " +"<arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> " +"<arg>generate <arg " +"choice=\"plain\"><replaceable>config-file</replaceable></arg> <arg " +"choice=\"plain\" " +"rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean " +"<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> " +"</group>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:55 +msgid "" +"<command>apt-ftparchive</command> is the command line tool that generates " +"the index files that APT uses to access a distribution source. The index " +"files should be generated on the origin site based on the content of that " +"site." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:59 +msgid "" +"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " +"program, incorporating its entire functionality via the " +"<literal>packages</literal> command. It also contains a contents file " +"generator, <literal>contents</literal>, and an elaborate means to 'script' " +"the generation process for a complete archive." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:65 +msgid "" +"Internally <command>apt-ftparchive</command> can make use of binary " +"databases to cache the contents of a .deb file and it does not rely on any " +"external programs aside from &gzip;. When doing a full generate it " +"automatically performs file-change checks and builds the desired compressed " +"output files." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:74 +msgid "packages" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:76 +msgid "" +"The packages command generates a package file from a directory tree. It " +"takes the given directory and recursively searches it for .deb files, " +"emitting a package record to stdout for each. This command is approximately " +"equivalent to &dpkg-scanpackages;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:81 apt-ftparchive.1.xml:105 +msgid "The option <option>--db</option> can be used to specify a binary caching DB." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:84 +msgid "sources" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:86 +msgid "" +"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, emitting a source record to stdout for each. This command is " +"approximately equivalent to &dpkg-scansources;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:91 +msgid "" +"If an override file is specified then a source override file will be looked " +"for with an extension of .src. The --source-override option can be used to " +"change the source override file that will be used." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:96 +msgid "contents" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:98 +msgid "" +"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, and reads the file list from each file. It then sorts and writes " +"to stdout the list of files matched to packages. Directories are not written " +"to the output. If multiple packages own the same file then each package is " +"separated by a comma in the output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:108 +msgid "release" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:110 +msgid "" +"The <literal>release</literal> command generates a Release file from a " +"directory tree. It recursively searches the given directory for Packages, " +"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " +"md5sum.txt files. It then writes to stdout a Release file containing an MD5 " +"digest and SHA1 digest for each file." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:117 +msgid "" +"Values for the additional metadata fields in the Release file are taken from " +"the corresponding variables under " +"<literal>APT::FTPArchive::Release</literal>, " +"e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The supported " +"fields are: <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:127 +msgid "generate" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:129 +msgid "" +"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 provides a flexible means of specifying which index files " +"are built from which directories, as well as providing a simple means of " +"maintaining the required settings." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:136 apt-get.8.xml:272 +msgid "clean" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:138 +msgid "" +"The <literal>clean</literal> command tidies the databases used by the given " +"configuration file by removing any records that are no longer necessary." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:144 +msgid "The Generate Configuration" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:146 +msgid "" +"The <literal>generate</literal> command uses a configuration file to " +"describe the archives that are going to be generated. It follows the typical " +"ISC configuration format as seen in ISC tools like bind 8 and dhcpd. " +"&apt-conf; contains a description of the syntax. Note that the generate " +"configuration is parsed in sectional manner, but &apt-conf; is parsed in a " +"tree manner. This only effects how the scope tag is handled." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:154 +msgid "The generate configuration has 4 separate sections, each described below." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:156 +msgid "Dir Section" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:158 +msgid "" +"The <literal>Dir</literal> section defines the standard directories needed " +"to locate the files required during the generation process. These " +"directories are prepended to certain relative paths defined in later " +"sections to produce a complete an absolute path." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:163 +msgid "ArchiveDir" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:165 +msgid "" +"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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:170 +msgid "OverrideDir" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:172 +msgid "Specifies the location of the override files." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:175 +msgid "CacheDir" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:177 +msgid "Specifies the location of the cache files" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:180 +msgid "FileListDir" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:182 +msgid "" +"Specifies the location of the file list files, if the " +"<literal>FileList</literal> setting is used below." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:188 +msgid "Default Section" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:190 +msgid "" +"The <literal>Default</literal> section specifies default values, and " +"settings that control the operation of the generator. Other sections may " +"override these defaults with a per-section setting." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:194 +msgid "Packages::Compress" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:196 +msgid "" +"Sets the default compression schemes to use for the Package index files. It " +"is a string that contains a space separated list of at least one of: '.' (no " +"compression), 'gzip' and 'bzip2'. The default for all compression schemes is " +"'. gzip'." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:202 +msgid "Packages::Extensions" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:204 +msgid "" +"Sets the default list of file extensions that are package files. This " +"defaults to '.deb'." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:208 +msgid "Sources::Compress" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:210 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Sources files." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:214 +msgid "Sources::Extensions" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:216 +msgid "" +"Sets the default list of file extensions that are source files. This " +"defaults to '.dsc'." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:220 +msgid "Contents::Compress" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:222 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Contents files." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:226 +msgid "DeLinkLimit" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:228 +msgid "" +"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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:233 +msgid "FileMode" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:235 +msgid "" +"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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:242 +msgid "TreeDefault Section" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:244 +msgid "" +"Sets defaults specific to <literal>Tree</literal> sections. All of these " +"variables are substitution variables and have the strings $(DIST), " +"$(SECTION) and $(ARCH) replaced with their respective values." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:249 +msgid "MaxContentsChange" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:251 +msgid "" +"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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:256 +msgid "ContentsAge" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:258 +msgid "" +"Controls the number of days a contents file is allowed to be checked without " +"changing. If this limit is passed the mtime of the contents file is " +"updated. This case can occur if the package file is changed in such a way " +"that does not result in a new contents file [override edit for instance]. A " +"hold off is allowed in hopes that new .debs will be installed, requiring a " +"new file anyhow. The default is 10, the units are in days." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:267 +msgid "Directory" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:269 +msgid "" +"Sets the top of the .deb directory tree. Defaults to " +"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:273 +msgid "SrcDirectory" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:275 +msgid "" +"Sets the top of the source package directory tree. Defaults to " +"<filename>$(DIST)/$(SECTION)/source/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:405 +msgid "Packages" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:281 +msgid "" +"Sets the output Packages file. Defaults to " +"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:410 +msgid "Sources" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:287 +msgid "" +"Sets the output Packages file. Defaults to " +"<filename>$(DIST)/$(SECTION)/source/Sources</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:291 +msgid "InternalPrefix" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:293 +msgid "" +"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>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:416 +msgid "Contents" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:300 +msgid "" +"Sets the output Contents file. Defaults to " +"<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes " +"multiple Packages files to map onto a single Contents file (such as the " +"default) then <command>apt-ftparchive</command> will integrate those " +"package files together automatically." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:307 +msgid "Contents::Header" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:309 +msgid "Sets header file to prepend to the contents output." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:312 apt-ftparchive.1.xml:441 +msgid "BinCacheDB" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:314 +msgid "" +"Sets the binary cache database to use for this section. Multiple sections " +"can share the same database." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:318 +msgid "FileList" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:320 +msgid "" +"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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:325 +msgid "SourceFileList" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:327 +msgid "" +"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. " +"This is used when processing source indexes." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:335 +msgid "Tree Section" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:337 +msgid "" +"The <literal>Tree</literal> section defines a standard Debian file tree " +"which consists of a base directory, then multiple sections in that base " +"directory and finally multiple Architectures in each section. The exact " +"pathing used is defined by the <literal>Directory</literal> substitution " +"variable." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:342 +msgid "" +"The <literal>Tree</literal> section takes a scope tag which sets the " +"<literal>$(DIST)</literal> variable and defines the root of the tree (the " +"path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " +"setting such as <filename>dists/woody</filename>." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:347 +msgid "" +"All of the settings defined in the <literal>TreeDefault</literal> section " +"can be use in a <literal>Tree</literal> section as well as three new " +"variables." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:350 +msgid "" +"When processing a <literal>Tree</literal> section " +"<command>apt-ftparchive</command> performs an operation similar to:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#: apt-ftparchive.1.xml:353 +#, no-wrap +msgid "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:359 +msgid "Sections" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:361 +msgid "" +"This is a space separated list of sections which appear under the " +"distribution, typically this is something like <literal>main contrib " +"non-free</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:366 +msgid "Architectures" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:368 +msgid "" +"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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:373 apt-ftparchive.1.xml:421 +msgid "BinOverride" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:375 +msgid "" +"Sets the binary override file. The override file contains section, priority " +"and maintainer address information." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:379 apt-ftparchive.1.xml:426 +msgid "SrcOverride" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:381 +msgid "" +"Sets the source override file. The override file contains section " +"information." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:385 apt-ftparchive.1.xml:431 +msgid "ExtraOverride" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 +msgid "Sets the binary extra override file." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:390 apt-ftparchive.1.xml:436 +msgid "SrcExtraOverride" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 +msgid "Sets the source extra override file." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:397 +msgid "BinDirectory Section" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:399 +msgid "" +"The <literal>bindirectory</literal> section defines a binary directory tree " +"with no special structure. The scope tag specifies the location of the " +"binary directory and the settings are similar to the <literal>Tree</literal> " +"section with no substitution variables or " +"<literal>Section</literal><literal>Architecture</literal> settings." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:407 +msgid "Sets the Packages file output." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:412 +msgid "" +"Sets the Sources file output. At least one of <literal>Packages</literal> or " +"<literal>Sources</literal> is required." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:418 +msgid "Sets the Contents file output. (optional)" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:423 +msgid "Sets the binary override file." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:428 +msgid "Sets the source override file." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:443 +msgid "Sets the cache DB." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:446 +msgid "PathPrefix" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:448 +msgid "Appends a path to all the output paths." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:451 +msgid "FileList, SourceFileList" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:453 +msgid "Specifies the file list file." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:460 +msgid "The Binary Override File" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:461 +msgid "" +"The binary override file is fully compatible with &dpkg-scanpackages;. It " +"contains 4 fields separated by spaces. The first field is the package name, " +"the second is the priority to force that package to, the third is the the " +"section to force that package to and the final field is the maintainer " +"permutation field." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:467 +#, no-wrap +msgid "old [// oldn]* => new" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:469 +#, no-wrap +msgid "new" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:466 +msgid "" +"The general form of the maintainer field is: <placeholder " +"type=\"literallayout\" id=\"0\"/> or simply, <placeholder " +"type=\"literallayout\" id=\"1\"/> The first form allows a double-slash " +"separated list of old email addresses to be specified. If any of those are " +"found then new is substituted for the maintainer field. The second form " +"unconditionally substitutes the maintainer field." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:477 +msgid "The Source Override File" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:479 +msgid "" +"The source override file is fully compatible with &dpkg-scansources;. It " +"contains 2 fields separated by spaces. The first fields is the source " +"package name, the second is the section to assign it." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:484 +msgid "The Extra Override File" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:486 +msgid "" +"The extra override file allows any arbitrary tag to be added or replaced in " +"the output. It has 3 columns, the first is the package, the second is the " +"tag and the remainder of the line is the new value." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:495 +msgid "<option>--md5</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:497 +msgid "" +"Generate MD5 sums. This defaults to on, when turned off the generated index " +"files will not have MD5Sum fields where possible. Configuration Item: " +"<literal>APT::FTPArchive::MD5</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:502 +msgid "<option>--db</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:504 +msgid "" +"Use a binary caching DB. This has no effect on the generate command. " +"Configuration Item: <literal>APT::FTPArchive::DB</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:510 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Configuration Item: <literal>quiet</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:516 +msgid "<option>--delink</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:518 +msgid "" +"Perform Delinking. If the <literal>External-Links</literal> setting is used " +"then this option actually enables delinking of the files. It defaults to on " +"and can be turned off with <option>--no-delink</option>. Configuration " +"Item: <literal>APT::FTPArchive::DeLinkAct</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:524 +msgid "<option>--contents</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:526 +msgid "" +"Perform contents generation. When this option is set and package indexes are " +"being generated with a cache DB then the file listing will also be extracted " +"and stored in the DB for later use. When using the generate command this " +"option also allows the creation of any Contents files. The default is on. " +"Configuration Item: <literal>APT::FTPArchive::Contents</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:534 +msgid "<option>--source-override</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:536 +msgid "" +"Select the source override file to use with the <literal>sources</literal> " +"command. Configuration Item: " +"<literal>APT::FTPArchive::SourceOverride</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:540 +msgid "<option>--readonly</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:542 +msgid "" +"Make the caching databases read only. Configuration Item: " +"<literal>APT::FTPArchive::ReadOnlyDB</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:551 apt.conf.5.xml:818 apt_preferences.5.xml:460 sources.list.5.xml:180 +msgid "Examples" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><programlisting> +#: apt-ftparchive.1.xml:557 +#, no-wrap +msgid "" +"<command>apt-ftparchive</command> packages " +"<replaceable>directory</replaceable> | <command>gzip</command> > " +"<filename>Packages.gz</filename>\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:553 +msgid "" +"To create a compressed Packages file for a directory containing binary " +"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:567 +msgid "" +"<command>apt-ftparchive</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-get.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-get.8.xml:22 apt-get.8.xml:28 +msgid "apt-get" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-get.8.xml:29 +msgid "APT package handling utility -- command-line interface" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-get.8.xml:35 +msgid "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> " +"</group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> " +"=<replaceable>pkg_version_number</replaceable> </arg> <arg choice='plain'> " +"/<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"/<replaceable>target_release_codename</replaceable> </arg> </group> </arg> " +"</arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>purge <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>source <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> " +"=<replaceable>pkg_version_number</replaceable> </arg> </arg> </arg> <arg " +"choice='plain'>build-dep <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:115 +msgid "" +"<command>apt-get</command> is the command-line tool for handling packages, " +"and may be considered the user's \"back-end\" to other tools using the APT " +"library. Several \"front-end\" interfaces exist, such as &dselect;, " +"&aptitude;, &synaptic;, &gnome-apt; and &wajig;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:124 apt-key.8.xml:122 +msgid "update" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:125 +msgid "" +"<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>. For " +"example, when using a Debian archive, this command retrieves and scans the " +"<filename>Packages.gz</filename> files, so that information about new and " +"updated packages is available. An <literal>update</literal> should always be " +"performed before an <literal>upgrade</literal> or " +"<literal>dist-upgrade</literal>. Please be aware that the overall progress " +"meter will be incorrect as the size of the package files cannot be known in " +"advance." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:136 +msgid "upgrade" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:137 +msgid "" +"<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 new versions available are retrieved and upgraded; under no " +"circumstances are currently installed packages removed, or packages not " +"already installed retrieved and installed. New versions of currently " +"installed packages that cannot be upgraded without changing the install " +"status of another package will be left at their current version. An " +"<literal>update</literal> must be performed first so that " +"<command>apt-get</command> knows that new versions of packages are " +"available." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:149 +msgid "dselect-upgrade" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:150 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, " +"&dselect;. <literal>dselect-upgrade</literal> follows the changes made by " +"&dselect; to the <literal>Status</literal> field of available packages, and " +"performs the actions necessary to realize that state (for instance, the " +"removal of old and the installation of new packages)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:159 +msgid "dist-upgrade" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:160 +msgid "" +"<literal>dist-upgrade</literal> in addition to performing the function of " +"<literal>upgrade</literal>, also intelligently handles changing dependencies " +"with new versions of packages; <command>apt-get</command> has a \"smart\" " +"conflict resolution system, and it will attempt to upgrade the most " +"important packages at the expense of less important ones if necessary. So, " +"<literal>dist-upgrade</literal> command may remove some packages. The " +"<filename>/etc/apt/sources.list</filename> file contains a list of locations " +"from which to retrieve desired package files. See also &apt-preferences; " +"for a mechanism for overriding the general settings for individual packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:172 +msgid "install" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:174 +msgid "" +"<literal>install</literal> is followed by one or more packages desired for " +"installation or upgrading. Each package is a package name, not a fully " +"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " +"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " +"packages required by the package(s) specified for installation will also be " +"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " +"file is used to locate the desired packages. If a hyphen is appended to the " +"package name (with no intervening space), the identified package will be " +"removed if it is installed. Similarly a plus sign can be used to designate " +"a package to install. These latter features may be used to override " +"decisions made by apt-get's conflict resolution system." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:192 +msgid "" +"A specific version of a package can be selected for installation by " +"following the package name with an equals and the version of the package to " +"select. This will cause that version to be located and selected for " +"install. Alternatively a specific distribution can be selected by following " +"the package name with a slash and the version of the distribution or the " +"Archive name (stable, testing, unstable)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:199 +msgid "" +"Both of the version selection mechanisms can downgrade packages and must be " +"used with care." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:202 +msgid "" +"This is also the target to use if you want to upgrade one or more " +"already-installed packages without upgrading every package you have on your " +"system. Unlike the \"upgrade\" target, which installs the newest version of " +"all currently installed packages, \"install\" will install the newest " +"version of only the package(s) specified. Simply provide the name of the " +"package(s) you wish to upgrade, and if a newer version is available, it (and " +"its dependencies, as described above) will be downloaded and installed." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:213 +msgid "" +"Finally, the &apt-preferences; mechanism allows you to create an alternative " +"installation policy for individual packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:217 +msgid "" +"If no package matches the given expression and the expression contains one " +"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " +"it is applied to all package names in the database. Any matches are then " +"installed (or removed). Note that matching is done by substring so 'lo.*' " +"matches 'how-lo' and 'lowest'. If this is undesired, anchor the regular " +"expression with a '^' or '$' character, or create a more specific regular " +"expression." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:226 +msgid "remove" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:227 +msgid "" +"<literal>remove</literal> is identical to <literal>install</literal> except " +"that packages are removed instead of installed. Note the removing a package " +"leaves its configuration files in system. If a plus sign is appended to the " +"package name (with no intervening space), the identified package will be " +"installed instead of removed." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:234 +msgid "purge" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:235 +msgid "" +"<literal>purge</literal> is identical to <literal>remove</literal> except " +"that packages are removed and purged (any configuration files are deleted " +"too)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:239 +msgid "source" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:240 +msgid "" +"<literal>source</literal> causes <command>apt-get</command> to fetch source " +"packages. APT will examine the available packages to decide which source " +"package to fetch. It will then find and download into the current directory " +"the newest available version of that source package. Source packages are " +"tracked separately from binary packages via <literal>deb-src</literal> type " +"lines in the &sources-list; file. This probably will mean that you will not " +"get the same source as the package you have installed or as you could " +"install. If the --compile options is specified then the package will be " +"compiled to a binary .deb using dpkg-buildpackage, if --download-only is " +"specified then the source package will not be unpacked." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:251 +msgid "" +"A specific source version can be retrieved by postfixing the source name " +"with an equals and then the version to fetch, similar to the mechanism used " +"for the package files. This enables exact matching of the source package " +"name and version, implicitly enabling the " +"<literal>APT::Get::Only-Source</literal> option." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:257 +msgid "" +"Note that source packages are not tracked like binary packages, they exist " +"only in the current directory and are similar to downloading source tar " +"balls." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:262 +msgid "build-dep" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:263 +msgid "" +"<literal>build-dep</literal> causes apt-get to install/remove packages in an " +"attempt to satisfy the build dependencies for a source package." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:267 +msgid "check" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:268 +msgid "" +"<literal>check</literal> is a diagnostic tool; it updates the package cache " +"and checks for broken dependencies." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:273 +msgid "" +"<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 " +"<filename>&cachedir;/archives/partial/</filename>. When APT is used as a " +"&dselect; method, <literal>clean</literal> is run automatically. Those who " +"do not use dselect will likely want to run <literal>apt-get clean</literal> " +"from time to time to free up disk space." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:282 +msgid "autoclean" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:283 +msgid "" +"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 " +"useless. This allows a cache to be maintained over a long period without it " +"growing out of control. The configuration option " +"<literal>APT::Clean-Installed</literal> will prevent installed packages from " +"being erased if it is set to off." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:292 +msgid "autoremove" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:293 +msgid "" +"<literal>autoremove</literal> is used to remove packages that were " +"automatically installed to satisfy dependencies for some package and that " +"are no more needed." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:303 apt-get.8.xml:409 +msgid "<option>--no-install-recommends</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:304 +msgid "" +"Do not consider recommended packages as a dependency for installing. " +"Configuration Item: <literal>APT::Install-Recommends</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:308 +msgid "<option>--download-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:309 +msgid "" +"Download only; package files are only retrieved, not unpacked or installed. " +"Configuration Item: <literal>APT::Get::Download-Only</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:313 +msgid "<option>--fix-broken</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:314 +msgid "" +"Fix; attempt to correct a system with broken dependencies in place. This " +"option, when used with install/remove, can omit any packages to permit APT " +"to deduce a likely solution. Any Package that are specified must completely " +"correct the problem. The option is sometimes necessary when running APT for " +"the first time; APT itself does not allow broken package dependencies to " +"exist on a system. It is possible that a system's dependency structure can " +"be so corrupt as to require manual intervention (which usually means using " +"&dselect; or <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: " +"<literal>APT::Get::Fix-Broken</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:327 +msgid "<option>--ignore-missing</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:328 +msgid "<option>--fix-missing</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:329 +msgid "" +"Ignore missing packages; If packages cannot be retrieved or fail the " +"integrity check after retrieval (corrupted package files), hold back those " +"packages and handle the result. Use of this option together with " +"<option>-f</option> may produce an error in some situations. If a package is " +"selected for installation (particularly if it is mentioned on the command " +"line) and it could not be downloaded then it will be silently held back. " +"Configuration Item: <literal>APT::Get::Fix-Missing</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:339 +msgid "<option>--no-download</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:340 +msgid "" +"Disables downloading of packages. This is best used with " +"<option>--ignore-missing</option> to force APT to use only the .debs it has " +"already downloaded. Configuration Item: " +"<literal>APT::Get::Download</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:347 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Note that quiet level 2 implies <option>-y</option>, you should never " +"use -qq without a no-action modifier such as -d, --print-uris or -s as APT " +"may decided to do something you did not expect. Configuration Item: " +"<literal>quiet</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:357 +msgid "<option>--simulate</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:359 +msgid "<option>--dry-run</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:362 +msgid "" +"No action; perform a simulation of events that would occur but do not " +"actually change the system. Configuration Item: " +"<literal>APT::Get::Simulate</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:366 +msgid "" +"Simulation run as user will deactivate locking " +"(<literal>Debug::NoLocking</literal>) automatical. Also a notice will be " +"displayed indicating that this is only a simulation, if the option " +"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: " +"true) Neigther NoLocking nor the notice will be triggered if run as root " +"(root should know what he is doing without further warnings by " +"<literal>apt-get</literal>)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:372 +msgid "" +"Simulate prints out a series of lines each one representing a dpkg " +"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " +"indicate broken packages with and empty set of square brackets meaning " +"breaks that are of no consequence (rare)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>-y</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>--yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:380 +msgid "<option>--assume-yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:381 +msgid "" +"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " +"non-interactively. If an undesirable situation, such as changing a held " +"package, trying to install a unauthenticated package or removing an " +"essential package occurs then <literal>apt-get</literal> will abort. " +"Configuration Item: <literal>APT::Get::Assume-Yes</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:388 +msgid "<option>-u</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:388 +msgid "<option>--show-upgraded</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:389 +msgid "" +"Show upgraded packages; Print out a list of all packages that are to be " +"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:394 +msgid "<option>-V</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:394 +msgid "<option>--verbose-versions</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:395 +msgid "" +"Show full versions for upgraded and installed packages. Configuration Item: " +"<literal>APT::Get::Show-Versions</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>-b</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>--compile</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:400 +msgid "<option>--build</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:401 +msgid "" +"Compile source packages after downloading them. Configuration Item: " +"<literal>APT::Get::Compile</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:405 +msgid "<option>--install-recommends</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:406 +msgid "Also install recommended packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:410 +msgid "Do not install recommended packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:413 +msgid "<option>--ignore-hold</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:414 +msgid "" +"Ignore package Holds; This causes <command>apt-get</command> to ignore a " +"hold placed on a package. This may be useful in conjunction with " +"<literal>dist-upgrade</literal> to override a large number of undesired " +"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:420 +msgid "<option>--no-upgrade</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:421 +msgid "" +"Do not upgrade packages; When used in conjunction with " +"<literal>install</literal>, <literal>no-upgrade</literal> will prevent " +"packages on the command line from being upgraded if they are already " +"installed. Configuration Item: <literal>APT::Get::Upgrade</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:427 +msgid "<option>--force-yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:428 +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 " +"not be used except in very special situations. Using " +"<literal>force-yes</literal> can potentially destroy your system! " +"Configuration Item: <literal>APT::Get::force-yes</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:435 +msgid "<option>--print-uris</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:436 +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 " +"hash. Note that the file name to write to will not always match the file " +"name on the remote site! This also works with the <literal>source</literal> " +"and <literal>update</literal> commands. When used with the " +"<literal>update</literal> command the MD5 and size are not included, and it " +"is up to the user to decompress any compressed files. Configuration Item: " +"<literal>APT::Get::Print-URIs</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:446 +msgid "<option>--purge</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:447 +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. <option>remove --purge</option> is equivalent for " +"<option>purge</option> command. Configuration Item: " +"<literal>APT::Get::Purge</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--reinstall</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +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:459 +msgid "<option>--list-cleanup</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:460 +msgid "" +"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " +"it off. When on <command>apt-get</command> will automatically manage the " +"contents of <filename>&statedir;/lists</filename> to ensure that obsolete " +"files are erased. The only reason to turn it off is if you frequently " +"change your source list. Configuration Item: " +"<literal>APT::Get::List-Cleanup</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:469 +msgid "<option>--target-release</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:470 +msgid "<option>--default-release</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:471 +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 " +"overrides the general settings in " +"<filename>/etc/apt/preferences</filename>. Specifically pinned packages are " +"not affected by the value of this option. In short, this option lets you " +"have simple control over which distribution packages will be retrieved " +"from. Some common examples might be <option>-t '2.1*'</option>, <option>-t " +"unstable</option> or <option>-t sid</option>. Configuration Item: " +"<literal>APT::Default-Release</literal>; see also the &apt-preferences; " +"manual page." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:484 +msgid "<option>--trivial-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:486 +msgid "" +"Only perform operations that are 'trivial'. Logically this can be considered " +"related to <option>--assume-yes</option>, where " +"<option>--assume-yes</option> will answer yes to any prompt, " +"<option>--trivial-only</option> will answer no. Configuration Item: " +"<literal>APT::Get::Trivial-Only</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:492 +msgid "<option>--no-remove</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:493 +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:498 +msgid "<option>--auto-remove</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:499 +msgid "" +"If the command is either <literal>install</literal> or " +"<literal>remove</literal>, then this option acts like running " +"<literal>autoremove</literal> command, removing the unused dependency " +"packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:505 +msgid "<option>--only-source</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:506 +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 mapped through the binary table. This means that if " +"this option is specified, these commands will only accept source package " +"names as arguments, rather than accepting binary package names and looking " +"up the corresponding source package. Configuration Item: " +"<literal>APT::Get::Only-Source</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +msgid "<option>--diff-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +msgid "<option>--dsc-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +msgid "<option>--tar-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:517 +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</literal>, and " +"<literal>APT::Get::Tar-Only</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:522 +msgid "<option>--arch-only</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:523 +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:527 +msgid "<option>--allow-unauthenticated</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:528 +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::AllowUnauthenticated</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:546 apt.conf.5.xml:825 +msgid "<filename>/etc/apt/apt.conf</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:547 +msgid "" +"APT configuration file. Configuration Item: " +"<literal>Dir::Etc::Main</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:551 +msgid "<filename>/etc/apt/apt.conf.d/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:552 +msgid "" +"APT configuration file fragments. Configuration Item: " +"<literal>Dir::Etc::Parts</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:556 +msgid "<filename>/etc/apt/preferences</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:557 +msgid "" +"Version preferences file. This is where you would specify \"pinning\", " +"i.e. a preference to get certain packages from a separate source or from a " +"different version of a distribution. Configuration Item: " +"<literal>Dir::Etc::Preferences</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:565 +msgid "<filename>&cachedir;/archives/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:566 +msgid "" +"Storage area for retrieved package files. Configuration Item: " +"<literal>Dir::Cache::Archives</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:570 +msgid "<filename>&cachedir;/archives/partial/</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:571 +msgid "" +"Storage area for package files in transit. Configuration Item: " +"<literal>Dir::Cache::Archives</literal> (implicit partial)." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:589 +msgid "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, " +"&apt-preferences;, the APT Howto." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:595 +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:598 +msgid "ORIGINAL AUTHORS" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:599 +msgid "&apt-author.jgunthorpe;" +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:602 +msgid "CURRENT AUTHORS" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:604 +msgid "&apt-author.team;" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-key.8.xml:14 apt-key.8.xml:20 +msgid "apt-key" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-key.8.xml:21 +msgid "APT key management utility" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-key.8.xml:27 +msgid "" +"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<arg " +"rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:35 +msgid "" +"<command>apt-key</command> is used to manage the list of keys used by apt to " +"authenticate packages. Packages which have been authenticated using these " +"keys will be considered trusted." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-key.8.xml:41 +msgid "Commands" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:43 +msgid "add <replaceable>filename</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:47 +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>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:55 +msgid "del <replaceable>keyid</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:59 +msgid "Remove a key from the list of trusted keys." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:66 +msgid "export <replaceable>keyid</replaceable>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:70 +msgid "Output the key <replaceable>keyid</replaceable> to standard output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:77 +msgid "exportall" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:81 +msgid "Output all trusted keys to standard output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:88 +msgid "list" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:92 +msgid "List trusted keys." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:99 +msgid "finger" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:103 +msgid "List fingerprints of trusted keys." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:110 +msgid "adv" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:114 +msgid "" +"Pass advanced options to gpg. With adv --recv-key you can download the " +"public key." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:126 +msgid "" +"Update the local keyring with the keyring of Debian archive keys and removes " +"from the keyring the archive keys which are no longer valid." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:139 +msgid "<filename>/etc/apt/trusted.gpg</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:140 +msgid "Keyring of local trusted keys, new keys will be added here." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:143 +msgid "<filename>/etc/apt/trustdb.gpg</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "Local trust database of archive keys." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:147 +msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:148 +msgid "Keyring of Debian archive trusted keys." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:151 +msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:152 +msgid "Keyring of Debian archive removed trusted keys." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:163 +msgid "&apt-get;, &apt-secure;" +msgstr "" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-mark.8.xml:13 +msgid "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " +"November 2007</date>" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-mark.8.xml:22 apt-mark.8.xml:28 +msgid "apt-mark" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-mark.8.xml:29 +msgid "mark/unmark a package as being automatically-installed" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-mark.8.xml:35 +msgid "" +"<command>apt-mark</command> <arg><option>-hv</option></arg> " +"<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group " +"choice=\"req\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:44 +msgid "" +"<command>apt-mark</command> will change whether a package has been marked as " +"being automatically installed." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:48 +msgid "" +"When you request that a package is installed, and as a result other packages " +"are installed to satisfy its dependencies, the dependencies are marked as " +"being automatically installed. Once these automatically installed packages " +"are no longer depended on by any manually installed packages, they will be " +"removed." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:55 +msgid "markauto" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:56 +msgid "" +"<literal>markauto</literal> is used to mark a package as being automatically " +"installed, which will cause the package to be removed when no more manually " +"installed packages depend on this package." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:63 +msgid "unmarkauto" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:64 +msgid "" +"<literal>unmarkauto</literal> is used to mark a package as being manually " +"installed, which will prevent the package from being automatically removed " +"if no other packages depend on it." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:76 +msgid "<option>-f=<filename>FILENAME</filename></option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:76 +msgid "<option>--file=<filename>FILENAME</filename></option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:79 +msgid "" +"Read/Write package stats from <filename>FILENAME</filename> instead of the " +"default location, which is <filename>extended_status</filename> in the " +"directory defined by the Configuration Item: <literal>Dir::State</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:85 +msgid "<option>-h</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:86 +msgid "<option>--help</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:87 +msgid "Show a short usage summary." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:93 +msgid "<option>-v</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:94 +msgid "<option>--version</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:95 +msgid "Show the program version." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:109 +msgid "" +"<command>apt-mark</command> returns zero on normal operation, non-zero on " +"error." +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-secure.8.xml:14 apt-secure.8.xml:35 +msgid "apt-secure" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-secure.8.xml:36 +msgid "Archive authentication support for APT" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:41 +msgid "" +"Starting with version 0.6, <command>apt</command> contains code that does " +"signature checking of the Release file for all archives. This ensures that " +"packages in the archive can't be modified by people who have no access to " +"the Release file signing key." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:49 +msgid "" +"If a package comes from a archive without a signature or with a signature " +"that apt does not have a key for that package is considered untrusted and " +"installing it will result in a big warning. <command>apt-get</command> will " +"currently only warn for unsigned archives, future releases might force all " +"sources to be verified before downloading packages from them." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:58 +msgid "" +"The package frontends &apt-get;, &aptitude; and &synaptic; support this new " +"authentication feature." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:63 +msgid "Trusted archives" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:66 +msgid "" +"The chain of trust from an apt archive to the end user is made up of " +"different steps. <command>apt-secure</command> is the last step in this " +"chain, trusting an archive does not mean that the packages that you trust it " +"do not contain malicious code but means that you trust the archive " +"maintainer. Its the archive maintainer responsibility to ensure that the " +"archive integrity is correct." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:74 +msgid "" +"apt-secure does not review signatures at a package level. If you require " +"tools to do this you should look at <command>debsig-verify</command> and " +"<command>debsign</command> (provided in the debsig-verify and devscripts " +"packages respectively)." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:81 +msgid "" +"The chain of trust in Debian starts when a maintainer uploads a new package " +"or a new version of a package to the Debian archive. This upload in order to " +"become effective needs to be signed by a key of a maintainer within the " +"Debian maintainer's keyring (available in the debian-keyring " +"package). Maintainer's keys are signed by other maintainers following " +"pre-established procedures to ensure the identity of the key holder." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:91 +msgid "" +"Once the uploaded package is verified and included in the archive, the " +"maintainer signature is stripped off, an MD5 sum of the package is computed " +"and put in the Packages file. The MD5 sum of all of the packages files are " +"then computed and put into the Release file. The Release file is then signed " +"by the archive key (which is created once a year and distributed through the " +"FTP server. This key is also on the Debian keyring." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:101 +msgid "" +"Any end user can check the signature of the Release file, extract the MD5 " +"sum of a package from it and compare it with the MD5 sum of the package he " +"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian " +"package was checked. Now both the MD5 sum and the signature of the Release " +"file are checked." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:108 +msgid "" +"Notice that this is distinct from checking signatures on a per package " +"basis. It is designed to prevent two possible attacks:" +msgstr "" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:113 +msgid "" +"<literal>Network \"man in the middle\" attacks</literal>. Without signature " +"checking, a malicious agent can introduce himself in the package download " +"process and provide malicious software either by controlling a network " +"element (router, switch, etc.) or by redirecting traffic to a rogue server " +"(through arp or DNS spoofing attacks)." +msgstr "" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:121 +msgid "" +"<literal>Mirror network compromise</literal>. Without signature checking, a " +"malicious agent can compromise a mirror host and modify the files in it to " +"propagate malicious software to all users downloading packages from that " +"host." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:128 +msgid "" +"However, it does not defend against a compromise of the Debian master server " +"itself (which signs the packages) or against a compromise of the key used to " +"sign the Release files. In any case, this mechanism can complement a " +"per-package signature." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:134 +msgid "User configuration" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:136 +msgid "" +"<command>apt-key</command> is the program that manages the list of keys used " +"by apt. It can be used to add or remove keys although an installation of " +"this release will automatically provide the default Debian archive signing " +"keys used in the Debian package repositories." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:143 +msgid "" +"In order to add a new key you need to first download it (you should make " +"sure you are using a trusted communication channel when retrieving it), add " +"it with <command>apt-key</command> and then run <command>apt-get " +"update</command> so that apt can download and verify the " +"<filename>Release.gpg</filename> files from the archives you have " +"configured." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:152 +msgid "Archive configuration" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:154 +msgid "" +"If you want to provide archive signatures in an archive under your " +"maintenance you have to:" +msgstr "" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:159 +msgid "" +"<literal>Create a toplevel Release file</literal>. if it does not exist " +"already. You can do this by running <command>apt-ftparchive " +"release</command> (provided in apt-utils)." +msgstr "" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:164 +msgid "" +"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o " +"Release.gpg Release</command>." +msgstr "" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:167 +msgid "" +"<literal>Publish the key fingerprint</literal>, that way your users will " +"know what key they need to import in order to authenticate the files in the " +"archive." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:174 +msgid "" +"Whenever the contents of the archive changes (new packages are added or " +"removed) the archive maintainer has to follow the first two steps previously " +"outlined." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:182 +msgid "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:186 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:199 +msgid "Manpage Authors" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:201 +msgid "" +"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:28 +msgid "apt-sortpkgs" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-sortpkgs.1.xml:29 +msgid "Utility to sort package index files" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-sortpkgs.1.xml:35 +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 "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:44 +msgid "" +"<command>apt-sortpkgs</command> will take an index file (Source index or " +"Package index) and sort the records so that they are ordered by the package " +"name. It will also sort the internal fields of each record according to the " +"internal sorting rules." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:50 +msgid "All output is sent to stdout, the input must be a seekable file." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-sortpkgs.1.xml:57 +msgid "<option>--source</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-sortpkgs.1.xml:59 +msgid "" +"Use Source index field ordering. Configuration Item: " +"<literal>APT::SortPkgs::Source</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:73 +msgid "" +"<command>apt-sortpkgs</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt.conf.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; <author> " +"<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial " +"documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> " +"</author> &apt-email; &apt-product; <date>10 December 2008</date>" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt.conf.5.xml:28 apt.conf.5.xml:34 +msgid "apt.conf" +msgstr "" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 +msgid "5" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt.conf.5.xml:35 +msgid "Configuration file for APT" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:39 +msgid "" +"<filename>apt.conf</filename> is the main configuration file for the APT " +"suite of tools, all tools make use of the configuration file and a common " +"command line parser to provide a uniform environment. When an APT tool " +"starts up it will read the configuration specified by the " +"<envar>APT_CONFIG</envar> environment variable (if any) and then read the " +"files in <literal>Dir::Etc::Parts</literal> then read the main configuration " +"file specified by <literal>Dir::Etc::main</literal> then finally apply the " +"command line options to override the configuration directives, possibly " +"loading even more config files." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:49 +msgid "" +"The configuration file is organized in a tree with options organized into " +"functional groups. option specification is given with a double colon " +"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option " +"within the APT tool group, for the Get tool. options do not inherit from " +"their parent groups." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:55 +msgid "" +"Syntactically the configuration language is modeled after what the ISC tools " +"such as bind and dhcp use. Lines starting with <literal>//</literal> are " +"treated as comments (ignored), as well as all text between " +"<literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments. " +"Each line is of the form <literal>APT::Get::Assume-Yes \"true\";</literal> " +"The trailing semicolon is required and the quotes are optional. A new scope " +"can be opened with curly braces, like:" +msgstr "" + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:65 +#, no-wrap +msgid "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:73 +msgid "" +"with newlines placed to make it more readable. Lists can be created by " +"opening a scope and including a single string enclosed in quotes followed by " +"a semicolon. Multiple entries can be included, each separated by a " +"semicolon." +msgstr "" + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:78 +#, no-wrap +msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:81 +msgid "" +"In general the sample configuration file in " +"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good " +"guide for how it should look." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:85 +msgid "" +"The names of the configuration items are not case-sensitive. So in the " +"previous example you could use <literal>dpkg::pre-install-pkgs</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:88 +msgid "" +"Two specials are allowed, <literal>#include</literal> and " +"<literal>#clear</literal> <literal>#include</literal> will include the given " +"file, unless the filename ends in a slash, then the whole directory is " +"included. <literal>#clear</literal> is used to erase a part of the " +"configuration tree. The specified element and all its descendents are " +"erased." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 +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." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:101 +msgid "The APT Group" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:102 +msgid "" +"This group of options controls general APT behavior as well as holding the " +"options for all of the tools." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:106 +msgid "Architecture" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:107 +msgid "" +"System Architecture; sets the architecture to use when fetching files and " +"parsing package lists. The internal default is the architecture apt was " +"compiled for." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:112 +msgid "Default-Release" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:113 +msgid "" +"Default release to install packages from if more than one version " +"available. Contains release name, codename or release version. Examples: " +"'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also " +"&apt-preferences;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:117 +msgid "Ignore-Hold" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:118 +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:122 +msgid "Clean-Installed" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:123 +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 " +"then packages that are locally installed are also excluded from cleaning - " +"but note that APT provides no direct means to reinstall them." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:129 +msgid "Immediate-Configure" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:130 +msgid "" +"Disable Immediate Configuration; This dangerous option disables some of " +"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " +"necessary on some extremely slow single user systems but is very dangerous " +"and may cause package install scripts to fail or worse. Use at your own " +"risk." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:137 +msgid "Force-LoopBreak" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:138 +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/Conflicts or Conflicts/Pre-Depend loop between two essential " +"packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option " +"will work if the essential packages are not tar, gzip, libc, dpkg, bash or " +"anything that those packages depend on." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:146 +msgid "Cache-Limit" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:147 +msgid "" +"APT uses a fixed size memory mapped cache file to store the 'available' " +"information. This sets the size of that cache (in bytes)." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:151 +msgid "Build-Essential" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:152 +msgid "Defines which package(s) are considered essential build dependencies." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:155 +msgid "Get" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:156 +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:160 +msgid "Cache" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:161 +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:165 +msgid "CDROM" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:166 +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:172 +msgid "The Acquire Group" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:177 +msgid "PDiffs" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:178 +msgid "" +"Try to download deltas called <literal>PDiffs</literal> for Packages or " +"Sources files instead of downloading whole ones. True by default." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:183 +msgid "Queue-Mode" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:184 +msgid "" +"Queuing mode; <literal>Queue-Mode</literal> can be one of " +"<literal>host</literal> or <literal>access</literal> which determines how " +"APT parallelizes outgoing connections. <literal>host</literal> means that " +"one connection per target host will be opened, <literal>access</literal> " +"means that one connection per URI type will be opened." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:191 +msgid "Retries" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:192 +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:196 +msgid "Source-Symlinks" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:197 +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:201 sources.list.5.xml:138 +msgid "http" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:202 +msgid "" +"HTTP URIs; http::Proxy is the default http proxy to use. It is in the " +"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " +"host proxies can also be specified by using the form " +"<literal>http::Proxy::<host></literal> with the special keyword " +"<literal>DIRECT</literal> meaning to use no proxies. The " +"<envar>http_proxy</envar> environment variable will override all settings." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:209 +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 " +"response under any circumstances, <literal>Max-Age</literal> is sent only " +"for index files and tells the cache to refresh its object if it is older " +"than the given number of seconds. Debian updates its index files daily so " +"the default is 1 day. <literal>No-Store</literal> specifies that the cache " +"should never store this request, it is only set for archive files. This may " +"be useful to prevent polluting a proxy cache with very large .deb " +"files. Note: Squid 2.0.2 does not support any of these options." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:219 apt.conf.5.xml:267 +msgid "" +"The option <literal>timeout</literal> sets the timeout timer used by the " +"method, this applies to all things including connection timeout and data " +"timeout." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:222 +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 "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:231 +msgid "https" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:232 +msgid "" +"HTTPS URIs. Cache-control and proxy options are the same as for " +"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"not supported yet." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +msgid "" +"<literal>CaInfo</literal> suboption specifies place of file that holds info " +"about trusted certificates. <literal><host>::CaInfo</literal> is " +"corresponding per-host option. <literal>Verify-Peer</literal> boolean " +"suboption determines whether verify server's host certificate against " +"trusted certificates or not. <literal><host>::Verify-Peer</literal> " +"is corresponding per-host option. <literal>Verify-Host</literal> boolean " +"suboption determines whether verify server's hostname or not. " +"<literal><host>::Verify-Host</literal> is corresponding per-host " +"option. <literal>SslCert</literal> determines what certificate to use for " +"client authentication. <literal><host>::SslCert</literal> is " +"corresponding per-host option. <literal>SslKey</literal> determines what " +"private key to use for client " +"authentication. <literal><host>::SslKey</literal> is corresponding " +"per-host option. <literal>SslForceVersion</literal> overrides default SSL " +"version to use. Can contain 'TLSv1' or 'SSLv3' string. " +"<literal><host>::SslForceVersion</literal> is corresponding per-host " +"option." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:254 sources.list.5.xml:149 +msgid "ftp" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:255 +msgid "" +"FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " +"standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and " +"is overridden by the <envar>ftp_proxy</envar> environment variable. To use a " +"ftp proxy you will have to set the <literal>ftp::ProxyLogin</literal> script " +"in the configuration file. This entry specifies the commands to send to tell " +"the proxy server what to connect to. Please see &configureindex; for an " +"example of how to do this. The substitution variables available are " +"<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> " +"<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> " +"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> Each is taken " +"from it's respective URI component." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:270 +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 " +"some situations require that passive mode be disabled and port mode ftp used " +"instead. This can be done globally, for connections that go through a proxy " +"or for a specific host (See the sample config file for examples)." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:277 +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 method above for syntax. You cannot set this in the " +"configuration file and it is not recommended to use FTP over HTTP due to its " +"low efficiency." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:282 +msgid "" +"The setting <literal>ForceExtended</literal> controls the use of RFC2428 " +"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " +"false, which means these commands are only used if the control connection is " +"IPv6. Setting this to true forces their use even on IPv4 connections. Note " +"that most FTP servers do not support RFC2428." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:289 sources.list.5.xml:131 +msgid "cdrom" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:295 +#, no-wrap +msgid "\"/cdrom/\"::Mount \"foo\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:290 +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 " +"drive as specified in <filename>/etc/fstab</filename>. It is possible to " +"provide alternate mount and unmount commands if your mount point cannot be " +"listed in the fstab (such as an SMB mount and old mount packages). The " +"syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the " +"cdrom block. It is important to have the trailing slash. Unmount commands " +"can be specified using UMount." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:300 +msgid "gpgv" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:301 +msgid "" +"GPGV URIs; the only option for GPGV URIs is the option to pass additional " +"parameters to gpgv. <literal>gpgv::Options</literal> Additional options " +"passed to gpgv." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:173 +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:310 +msgid "Directories" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:312 +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>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:319 +msgid "" +"<literal>Dir::Cache</literal> contains locations pertaining to local cache " +"information, such as the two package caches <literal>srcpkgcache</literal> " +"and <literal>pkgcache</literal> as well as the location to place downloaded " +"archives, <literal>Dir::Cache::archives</literal>. Generation of caches can " +"be turned off by setting their names to be blank. This will slow down " +"startup but save disk space. It is probably preferred to turn off the " +"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " +"default directory is contained in <literal>Dir::Cache</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:328 +msgid "" +"<literal>Dir::Etc</literal> contains the location of configuration files, " +"<literal>sourcelist</literal> gives the location of the sourcelist and " +"<literal>main</literal> is the default configuration file (setting has no " +"effect, unless it is done from the config file specified by " +"<envar>APT_CONFIG</envar>)." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:334 +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 " +"main config file is loaded." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:338 +msgid "" +"Binary programs are pointed to by " +"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " +"the location of the method handlers and <literal>gzip</literal>, " +"<literal>dpkg</literal>, <literal>apt-get</literal> " +"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and " +"<literal>apt-cache</literal> specify the location of the respective " +"programs." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:345 +msgid "" +"The configuration item <literal>RootDir</literal> has a special meaning. If " +"set, all paths in <literal>Dir::</literal> will be relative to " +"<literal>RootDir</literal>, <emphasis>even paths that are specified " +"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is " +"set to <filename>/tmp/staging</filename> and " +"<literal>Dir::State::status</literal> is set to " +"<filename>/var/lib/dpkg/status</filename>, then the status file will be " +"looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:358 +msgid "APT in DSelect" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:360 +msgid "" +"When APT is used as a &dselect; method several configuration directives " +"control the default behaviour. These are in the <literal>DSelect</literal> " +"section." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:364 +msgid "Clean" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:365 +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 " +"upgrading, prompt (the default) does so conditionally. auto removes only " +"those packages which are no longer downloadable (replaced with a new version " +"for instance). pre-auto performs this action before downloading new " +"packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:374 +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:378 +msgid "Updateoptions" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:379 +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:383 +msgid "PromptAfterUpdate" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:384 +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:390 +msgid "How APT calls dpkg" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:391 +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:396 +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 " +"&dpkg;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:401 +msgid "Pre-Invoke" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:401 +msgid "Post-Invoke" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:402 +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:408 +msgid "Pre-Install-Pkgs" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:409 +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort. APT will pass to the commands on standard input the " +"filenames of all .deb files it is going to install, one per line." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:415 +msgid "" +"Version 2 of this protocol dumps more information, including the protocol " +"version, the APT configuration space and the packages, files and versions " +"being changed. Version 2 is enabled by setting " +"<literal>DPkg::Tools::options::cmd::Version</literal> to " +"2. <literal>cmd</literal> is a command given to " +"<literal>Pre-Install-Pkgs</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:422 +msgid "Run-Directory" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:423 +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:427 +msgid "Build-options" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:428 +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><title> +#: apt.conf.5.xml:435 +msgid "Periodic and Archives options" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:436 +msgid "" +"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " +"of options configure behavior of apt periodic updates, which is done by " +"<literal>/etc/cron.daily/apt</literal> script. See header of this script for " +"the brief documentation of these options." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:444 +msgid "Debug options" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:446 +msgid "" +"Enabling options in the <literal>Debug::</literal> section will cause " +"debugging information to be sent to the standard error stream of the program " +"utilizing the <literal>apt</literal> libraries, or enable special program " +"modes that are primarily useful for debugging the behavior of " +"<literal>apt</literal>. Most of these options are not interesting to a " +"normal user, but a few may be:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:457 +msgid "" +"<literal>Debug::pkgProblemResolver</literal> enables output about the " +"decisions made by <literal>dist-upgrade, upgrade, install, remove, " +"purge</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:465 +msgid "" +"<literal>Debug::NoLocking</literal> disables all file locking. This can be " +"used to run some operations (for instance, <literal>apt-get -s " +"install</literal>) as a non-root user." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:474 +msgid "" +"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " +"time that <literal>apt</literal> invokes &dpkg;." +msgstr "" + +#. TODO: provide a +#. 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:482 +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:492 +msgid "A full list of debugging options to apt follows." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +msgid "<literal>Debug::Acquire::cdrom</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:501 +msgid "Print information related to accessing <literal>cdrom://</literal> sources." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:508 +msgid "<literal>Debug::Acquire::ftp</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:512 +msgid "Print information related to downloading packages using FTP." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:519 +msgid "<literal>Debug::Acquire::http</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:523 +msgid "Print information related to downloading packages using HTTP." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "<literal>Debug::Acquire::https</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:534 +msgid "Print information related to downloading packages using HTTPS." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:541 +msgid "<literal>Debug::Acquire::gpgv</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:545 +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:552 +msgid "<literal>Debug::aptcdrom</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:556 +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:563 +msgid "<literal>Debug::BuildDeps</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:566 +msgid "Describes the process of resolving build-dependencies in &apt-get;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:573 +msgid "<literal>Debug::Hashes</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:576 +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:583 +msgid "<literal>Debug::IdentCDROM</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:586 +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 " +"a CD-ROM." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:594 +msgid "<literal>Debug::NoLocking</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:597 +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:605 +msgid "<literal>Debug::pkgAcquire</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:609 +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:616 +msgid "<literal>Debug::pkgAcquire::Auth</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:619 +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:626 +msgid "<literal>Debug::pkgAcquire::Diffs</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:629 +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:637 +msgid "<literal>Debug::pkgAcquire::RRed</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:641 +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:648 +msgid "<literal>Debug::pkgAcquire::Worker</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:652 +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:659 +msgid "<literal>Debug::pkgAutoRemove</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:663 +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:670 +msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:673 +msgid "" +"Generate debug messages describing which packages are being automatically " +"installed to resolve dependencies. This corresponds to the initial " +"auto-install pass performed in, e.g., <literal>apt-get install</literal>, " +"and not to the full <literal>apt</literal> dependency resolver; see " +"<literal>Debug::pkgProblemResolver</literal> for that." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:684 +msgid "<literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:687 +msgid "" +"Generate debug messages describing which package is marked as " +"keep/install/remove while the ProblemResolver does his work. Each addition " +"or deletion may trigger additional actions; they are shown indented two " +"additional space under the original entry. The format for each line is " +"<literal>MarkKeep</literal>, <literal>MarkDelete</literal> or " +"<literal>MarkInstall</literal> followed by <literal>package-name <a.b.c " +"-> d.e.f | x.y.z> (section)</literal> where <literal>a.b.c</literal> " +"is the current version of the package, <literal>d.e.f</literal> is the " +"version considered for installation and <literal>x.y.z</literal> is a newer " +"version, but not considered for installation (because of a low pin " +"score). The later two can be omitted if there is none or if it is the same " +"version as the installed. <literal>section</literal> is the name of the " +"section the package appears in." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:706 +msgid "<literal>Debug::pkgInitConfig</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:709 +msgid "Dump the default configuration to standard error on startup." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:716 +msgid "<literal>Debug::pkgDPkgPM</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:719 +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:727 +msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:730 +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:737 +msgid "<literal>Debug::pkgOrderList</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:741 +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:749 +msgid "<literal>Debug::pkgPackageManager</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:753 +msgid "Output status messages tracing the steps performed when invoking &dpkg;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:760 +msgid "<literal>Debug::pkgPolicy</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:764 +msgid "Output the priority of each package list on startup." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:770 +msgid "<literal>Debug::pkgProblemResolver</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:774 +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:782 +msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:785 +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 " +"described in <literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:793 +msgid "<literal>Debug::sourceList</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:797 +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:819 +msgid "" +"&configureindex; is a configuration file showing example values for all " +"possible options." +msgstr "" + +#. ? reading apt.conf +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:829 +msgid "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt_preferences.5.xml:13 +msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt_preferences.5.xml:21 apt_preferences.5.xml:27 +msgid "apt_preferences" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt_preferences.5.xml:28 +msgid "Preference control file for APT" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:33 +msgid "" +"The APT preferences file <filename>/etc/apt/preferences</filename> can be " +"used to control which versions of packages will be selected for " +"installation." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:37 +msgid "" +"Several versions of a package may be available for installation when the " +"&sources-list; file contains references to more than one distribution (for " +"example, <literal>stable</literal> and <literal>testing</literal>). APT " +"assigns a priority to each version that is available. Subject to dependency " +"constraints, <command>apt-get</command> selects the version with the highest " +"priority for installation. The APT preferences file overrides the " +"priorities that APT assigns to package versions by default, thus giving the " +"user control over which one is selected for installation." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:47 +msgid "" +"Several instances of the same version of a package may be available when the " +"&sources-list; file contains references to more than one source. In this " +"case <command>apt-get</command> downloads the instance listed earliest in " +"the &sources-list; file. The APT preferences file does not affect the " +"choice of instance, only the choice of version." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:54 +msgid "APT's Default Priority Assignments" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:69 +#, no-wrap +msgid "" +"<command>apt-get install -t testing " +"<replaceable>some-package</replaceable></command>\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:72 +#, no-wrap +msgid "APT::Default-Release \"stable\";\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:56 +msgid "" +"If there is no preferences file or if there is no entry in the file that " +"applies to a particular version then the priority assigned to that version " +"is the priority of the distribution to which that version belongs. It is " +"possible to single out a distribution, \"the target release\", which " +"receives a higher priority than other distributions do by default. The " +"target release can be set on the <command>apt-get</command> command line or " +"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note " +"that this has precedence over any general priority you set in the " +"<filename>/etc/apt/preferences</filename> file described later, but not over " +"specifically pinned packages. For example, <placeholder " +"type=\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" " +"id=\"1\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:81 +msgid "priority 100" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:82 +msgid "to the version that is already installed (if any)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:86 +msgid "priority 500" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:87 +msgid "" +"to the versions that are not installed and do not belong to the target " +"release." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:91 +msgid "priority 990" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:92 +msgid "to the versions that are not installed and belong to the target release." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:76 +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:97 +msgid "" +"If the target release has not been specified then APT simply assigns " +"priority 100 to all installed package versions and priority 500 to all " +"uninstalled package versions." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:101 +msgid "" +"APT then applies the following rules, listed in order of precedence, to " +"determine which version of a package to install." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:104 +msgid "" +"Never downgrade unless the priority of an available version exceeds 1000. " +"(\"Downgrading\" is installing a less recent version of a package in place " +"of a more recent version. Note that none of APT's default priorities " +"exceeds 1000; such high priorities can only be set in the preferences file. " +"Note also that downgrading a package can be risky.)" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:110 +msgid "Install the highest priority version." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:111 +msgid "" +"If two or more versions have the same priority, install the most recent one " +"(that is, the one with the higher version number)." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:114 +msgid "" +"If two or more versions have the same priority and version number but either " +"the packages differ in some of their metadata or the " +"<literal>--reinstall</literal> option is given, install the uninstalled one." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:120 +msgid "" +"In a typical situation, the installed version of a package (priority 100) " +"is not as recent as one of the versions available from the sources listed in " +"the &sources-list; file (priority 500 or 990). Then the package will be " +"upgraded when <command>apt-get install " +"<replaceable>some-package</replaceable></command> or <command>apt-get " +"upgrade</command> is executed." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:127 +msgid "" +"More rarely, the installed version of a package is <emphasis>more</emphasis> " +"recent than any of the other available versions. The package will not be " +"downgraded when <command>apt-get install " +"<replaceable>some-package</replaceable></command> or <command>apt-get " +"upgrade</command> is executed." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:132 +msgid "" +"Sometimes the installed version of a package is more recent than the version " +"belonging to the target release, but not as recent as a version belonging to " +"some other distribution. Such a package will indeed be upgraded when " +"<command>apt-get install <replaceable>some-package</replaceable></command> " +"or <command>apt-get upgrade</command> is executed, because at least " +"<emphasis>one</emphasis> of the available versions has a higher priority " +"than the installed version." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:141 +msgid "The Effect of APT Preferences" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:143 +msgid "" +"The APT preferences file allows the system administrator to control the " +"assignment of priorities. The file consists of one or more multi-line " +"records separated by blank lines. Records can have one of two forms, a " +"specific form and a general form." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:149 +msgid "" +"The specific form assigns a priority (a \"Pin-Priority\") to one or more " +"specified packages and specified version or version range. For example, the " +"following record assigns a high priority to all versions of the " +"<filename>perl</filename> package whose version number begins with " +"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:156 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:162 +msgid "" +"The general form assigns a priority to all of the package versions in a " +"given distribution (that is, to all the versions of packages that are listed " +"in a certain <filename>Release</filename> file) or to all of the package " +"versions coming from a particular Internet site, as identified by the site's " +"fully qualified domain name." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:168 +msgid "" +"This general-form entry in the APT preferences file applies only to groups " +"of packages. For example, the following record assigns a high priority to " +"all package versions available from the local site." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:173 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:178 +msgid "" +"A note of caution: the keyword used here is \"<literal>origin</literal>\". " +"This should not be confused with the Origin of a distribution as specified " +"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in " +"a <filename>Release</filename> file is not an Internet address but an author " +"or vendor name, such as \"Debian\" or \"Ximian\"." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:184 +msgid "" +"The following record assigns a low priority to all package versions " +"belonging to any distribution whose Archive name is " +"\"<literal>unstable</literal>\"." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:188 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:193 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any distribution whose Codename is " +"\"<literal>squeeze</literal>\"." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:197 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:202 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any release whose Archive name is \"<literal>stable</literal>\" " +"and whose release Version number is \"<literal>3.0</literal>\"." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:207 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:218 +msgid "How APT Interprets Priorities" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:226 +msgid "P > 1000" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:227 +msgid "" +"causes a version to be installed even if this constitutes a downgrade of the " +"package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:231 +msgid "990 < P <=1000" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:232 +msgid "" +"causes a version to be installed even if it does not come from the target " +"release, unless the installed version is more recent" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:237 +msgid "500 < P <=990" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:238 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to the target release or the installed version is more recent" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:243 +msgid "100 < P <=500" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:244 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to some other distribution or the installed version is more recent" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:249 +msgid "0 < P <=100" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:250 +msgid "" +"causes a version to be installed only if there is no installed version of " +"the package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:254 +msgid "P < 0" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:255 +msgid "prevents the version from being installed" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:221 +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking): " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:260 +msgid "" +"If any specific-form records match an available package version then the " +"first such record determines the priority of the package version. Failing " +"that, if any general-form records match an available package version then " +"the first such record determines the priority of the package version." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:266 +msgid "" +"For example, suppose the APT preferences file contains the three records " +"presented earlier:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:270 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:283 +msgid "Then:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:285 +msgid "" +"The most recent available version of the <literal>perl</literal> package " +"will be installed, so long as that version's version number begins with " +"\"<literal>5.8</literal>\". If <emphasis>any</emphasis> 5.8* version of " +"<literal>perl</literal> is available and the installed version is 5.9*, then " +"<literal>perl</literal> will be downgraded." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:290 +msgid "" +"A version of any package other than <literal>perl</literal> that is " +"available from the local system has priority over other versions, even " +"versions belonging to the target release." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:294 +msgid "" +"A version of a package whose origin is not the local system but some other " +"site listed in &sources-list; and which belongs to an " +"<literal>unstable</literal> distribution is only installed if it is selected " +"for installation and no version of the package is already installed." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:304 +msgid "Determination of Package Version and Distribution Properties" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:306 +msgid "" +"The locations listed in the &sources-list; file should provide " +"<filename>Packages</filename> and <filename>Release</filename> files to " +"describe the packages available at that location." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:318 +msgid "the <literal>Package:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:319 +msgid "gives the package name" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:322 apt_preferences.5.xml:372 +msgid "the <literal>Version:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:323 +msgid "gives the version number for the named package" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:310 +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " +"for example, " +"<filename>.../dists/stable/main/binary-i386/Packages</filename>. It " +"consists of a series of multi-line records, one for each package available " +"in that directory. Only two lines in each record are relevant for setting " +"APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:339 +msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:340 +msgid "" +"names the archive to which all the packages in the directory tree belong. " +"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " +"that all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file are in a <literal>stable</literal> " +"archive. Specifying this value in the APT preferences file would require " +"the line:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:350 +#, no-wrap +msgid "Pin: release a=stable\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:356 +msgid "the <literal>Codename:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:357 +msgid "" +"names the codename to which all the packages in the directory tree belong. " +"For example, the line \"Codename: squeeze\" specifies that all of the " +"packages in the directory tree below the parent of the " +"<filename>Release</filename> file belong to a version named " +"<literal>squeeze</literal>. Specifying this value in the APT preferences " +"file would require the line:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:366 +#, no-wrap +msgid "Pin: release n=squeeze\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:373 +msgid "" +"names the release version. For example, the packages in the tree might " +"belong to Debian GNU/Linux release version 3.0. Note that there is normally " +"no version number for the <literal>testing</literal> and " +"<literal>unstable</literal> distributions because they have not been " +"released yet. Specifying this in the APT preferences file would require one " +"of the following lines." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:382 +#, no-wrap +msgid "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:391 +msgid "the <literal>Component:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:392 +msgid "" +"names the licensing component associated with the packages in the directory " +"tree of the <filename>Release</filename> file. For example, the line " +"\"Component: main\" specifies that all the packages in the directory tree " +"are from the <literal>main</literal> component, which entails that they are " +"licensed under terms listed in the Debian Free Software Guidelines. " +"Specifying this component in the APT preferences file would require the " +"line:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:401 +#, no-wrap +msgid "Pin: release c=main\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:407 +msgid "the <literal>Origin:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:408 +msgid "" +"names the originator of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is " +"<literal>Debian</literal>. Specifying this origin in the APT preferences " +"file would require the line:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:414 +#, no-wrap +msgid "Pin: release o=Debian\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:420 +msgid "the <literal>Label:</literal> line" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:421 +msgid "" +"names the label of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is " +"<literal>Debian</literal>. Specifying this label in the APT preferences " +"file would require the line:" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:427 +#, no-wrap +msgid "Pin: release l=Debian\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:328 +msgid "" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or " +"<filename>.../dists/woody/Release</filename>. It consists of a single " +"multi-line record which applies to <emphasis>all</emphasis> of the packages " +"in the directory tree below its parent. Unlike the " +"<filename>Packages</filename> file, nearly all of the lines in a " +"<filename>Release</filename> file are relevant for setting APT priorities: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:434 +msgid "" +"All of the <filename>Packages</filename> and <filename>Release</filename> " +"files retrieved from locations listed in the &sources-list; file are stored " +"in the directory <filename>/var/lib/apt/lists</filename>, or in the file " +"named by the variable <literal>Dir::State::Lists</literal> in the " +"<filename>apt.conf</filename> file. For example, the file " +"<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> " +"contains the <filename>Release</filename> file retrieved from the site " +"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> " +"architecture files from the <literal>contrib</literal> component of the " +"<literal>unstable</literal> distribution." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:447 +msgid "Optional Lines in an APT Preferences Record" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:449 +msgid "" +"Each record in the APT preferences file can optionally begin with one or " +"more lines beginning with the word <literal>Explanation:</literal>. This " +"provides a place for comments." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:453 +msgid "" +"The <literal>Pin-Priority:</literal> line in each APT preferences record is " +"optional. If omitted, APT assigns a priority of 1 less than the last value " +"specified on a line beginning with <literal>Pin-Priority: release " +"...</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:462 +msgid "Tracking Stable" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:470 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:464 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"<literal>stable</literal> distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> " +"distributions. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:487 apt_preferences.5.xml:533 apt_preferences.5.xml:591 +#, no-wrap +msgid "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:482 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:499 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/testing\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:493 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>testing</literal> distribution; the package " +"will not be upgraded again unless this command is given again. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:505 +msgid "Tracking Testing or Unstable" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:514 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:507 +msgid "" +"The following APT preferences file will cause APT to assign a high priority " +"to package versions from the <literal>testing</literal> distribution, a " +"lower priority to package versions from the <literal>unstable</literal> " +"distribution, and a prohibitively low priority to package versions from " +"other <literal>Debian</literal> distributions. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:528 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:548 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/unstable\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:539 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>unstable</literal> distribution. " +"Thereafter, <command>apt-get upgrade</command> will upgrade the package to " +"the most recent <literal>testing</literal> version if that is more recent " +"than the installed version, otherwise, to the most recent " +"<literal>unstable</literal> version if that is more recent than the " +"installed version. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:555 +msgid "Tracking the evolution of a codename release" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:569 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated package " +"versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or " +"sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:557 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"specified codename of a distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> distributions, " +"codenames and archives. Note that with this APT preference APT will follow " +"the migration of a release from the archive <literal>testing</literal> to " +"<literal>stable</literal> and later <literal>oldstable</literal>. If you " +"want to follow for example the progress in <literal>testing</literal> " +"notwithstanding the codename changes you should use the example " +"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:586 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest version(s) in " +"the release codenamed with <literal>squeeze</literal>. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:606 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/sid\n" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:597 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>sid</literal> distribution. Thereafter, " +"<command>apt-get upgrade</command> will upgrade the package to the most " +"recent <literal>squeeze</literal> version if that is more recent than the " +"installed version, otherwise, to the most recent <literal>sid</literal> " +"version if that is more recent than the installed version. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:614 +msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refname> +#: sources.list.5.xml:22 sources.list.5.xml:28 +msgid "sources.list" +msgstr "" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: sources.list.5.xml:29 +msgid "Package resource list for APT" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:33 +msgid "" +"The package resource list is used to locate archives of the package " +"distribution system in use on the system. At this time, this manual page " +"documents only the packaging system used by the Debian GNU/Linux system. " +"This control file is located in <filename>/etc/apt/sources.list</filename>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:38 +msgid "" +"The source list is designed to support any number of active sources and a " +"variety of source media. The file lists one source per line, with the most " +"preferred source listed first. The format of each line is: <literal>type uri " +"args</literal> The first item, <literal>type</literal> determines the format " +"for <literal>args</literal> <literal>uri</literal> is a Universal Resource " +"Identifier (URI), which is a superset of the more specific and well-known " +"Universal Resource Locator, or URL. The rest of the line can be marked as a " +"comment by using a #." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:49 +msgid "sources.list.d" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:50 +msgid "" +"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " +"add sources.list entries in separate files. The format is the same as for " +"the regular <filename>sources.list</filename> file. File names need to end " +"with <filename>.list</filename> and may only contain letters (a-z and A-Z), " +"digits (0-9), underscore (_), hyphen (-) and period (.) characters. " +"Otherwise they will be silently ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:59 +msgid "The deb and deb-src types" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:60 +msgid "" +"The <literal>deb</literal> type describes a typical two-level Debian " +"archive, <filename>distribution/component</filename>. Typically, " +"<literal>distribution</literal> is generally one of " +"<literal>stable</literal> <literal>unstable</literal> or " +"<literal>testing</literal> while component is one of <literal>main</literal> " +"<literal>contrib</literal> <literal>non-free</literal> or " +"<literal>non-us</literal> The <literal>deb-src</literal> type describes a " +"debian distribution's source code in the same form as the " +"<literal>deb</literal> type. A <literal>deb-src</literal> line is required " +"to fetch source indexes." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:72 +msgid "" +"The format for a <filename>sources.list</filename> entry using the " +"<literal>deb</literal> and <literal>deb-src</literal> types are:" +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:75 +#, no-wrap +msgid "deb uri distribution [component1] [component2] [...]" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:77 +msgid "" +"The URI for the <literal>deb</literal> type must specify the base of the " +"Debian distribution, from which APT will find the information it needs. " +"<literal>distribution</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>distribution</literal> must end with " +"a slash (/). This is useful for when only a particular sub-section of the " +"archive denoted by the URI is of interest. If " +"<literal>distribution</literal> does not specify an exact path, at least one " +"<literal>component</literal> must be present." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:86 +msgid "" +"<literal>distribution</literal> may also contain a variable, " +"<literal>$(ARCH)</literal> which expands to the Debian architecture (i386, " +"m68k, powerpc, ...) used on the system. This permits " +"architecture-independent <filename>sources.list</filename> files to be " +"used. In general this is only of interest when specifying an exact path, " +"<literal>APT</literal> will automatically generate a URI with the current " +"architecture otherwise." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:94 +msgid "" +"Since only one distribution can be specified per line it may be necessary to " +"have multiple lines for the same URI, if a subset of all available " +"distributions or components at that location is desired. APT will sort the " +"URI list after it has generated a complete set internally, and will collapse " +"multiple references to the same Internet host, for instance, into a single " +"connection, so that it does not inefficiently establish an FTP connection, " +"close it, do something else, and then re-establish a connection to that same " +"host. This feature is useful for accessing busy FTP sites with limits on the " +"number of simultaneous anonymous users. APT also parallelizes connections to " +"different hosts to more effectively deal with sites with low bandwidth." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:106 +msgid "" +"It is important to list sources in order of preference, with the most " +"preferred source listed first. Typically this will result in sorting by " +"speed from fastest to slowest (CD-ROM followed by hosts on a local network, " +"followed by distant Internet hosts, for example)." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:111 +msgid "Some examples:" +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:113 +#, no-wrap +msgid "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " +msgstr "" + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:119 +msgid "URI specification" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:124 +msgid "file" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:126 +msgid "" +"The file scheme allows an arbitrary directory in the file system to be " +"considered an archive. This is useful for NFS mounts and local mirrors or " +"archives." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:133 +msgid "" +"The cdrom scheme allows APT to use a local CDROM drive with media " +"swapping. Use the &apt-cdrom; program to create cdrom entries in the source " +"list." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:140 +msgid "" +"The http scheme specifies an HTTP server for the archive. If an environment " +"variable <envar>http_proxy</envar> is set with the format " +"http://server:port/, the proxy server specified in <envar>http_proxy</envar> " +"will be used. Users of authenticated HTTP/1.1 proxies may use a string of " +"the format http://user:pass@server:port/ Note that this is an insecure " +"method of authentication." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:151 +msgid "" +"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " +"is highly configurable; for more information see the &apt-conf; manual " +"page. Please note that a ftp proxy can be specified by using the " +"<envar>ftp_proxy</envar> environment variable. It is possible to specify a " +"http proxy (http proxy servers often understand ftp urls) using this method " +"and ONLY this method. ftp proxies using http specified in the configuration " +"file will be ignored." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:160 +msgid "copy" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:162 +msgid "" +"The copy scheme is identical to the file scheme except that packages are " +"copied into the cache directory instead of used directly at their location. " +"This is useful for people using a zip disk to copy files around with APT." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:167 +msgid "rsh" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:167 +msgid "ssh" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:169 +msgid "" +"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " +"user and access the files. It is a good idea to do prior arrangements with " +"RSA keys or rhosts. Access to files on the remote uses standard " +"<command>find</command> and <command>dd</command> commands to perform the " +"file transfers from the remote." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:121 +msgid "" +"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " +"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:181 +msgid "" +"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " +"stable/main, stable/contrib, and stable/non-free." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:183 +#, no-wrap +msgid "deb file:/home/jason/debian stable main contrib non-free" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:185 +msgid "As above, except this uses the unstable (development) distribution." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:186 +#, no-wrap +msgid "deb file:/home/jason/debian unstable main contrib non-free" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:188 +msgid "Source line for the above" +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:189 +#, no-wrap +msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:191 +msgid "" +"Uses HTTP to access the archive at archive.debian.org, and uses only the " +"hamm/main area." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:193 +#, no-wrap +msgid "deb http://archive.debian.org/debian-archive hamm main" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:195 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the stable/contrib area." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:197 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian stable contrib" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:199 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the unstable/contrib area. If this line appears as " +"well as the one in the previous example in " +"<filename>sources.list</filename>. a single FTP session will be used for " +"both resource lines." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:203 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:205 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory." +msgstr "" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:207 +#, no-wrap +msgid "" +"deb http://nonus.debian.org/debian-non-US stable/non-US main contrib " +"non-free" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:216 +#, no-wrap +msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:209 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory, and uses only files found under " +"<filename>unstable/binary-i386</filename> on i386 machines, " +"<filename>unstable/binary-m68k</filename> on m68k, and so forth for other " +"supported architectures. [Note this example only illustrates how to use the " +"substitution variable; non-us is no longer structured like this] " +"<placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:221 +msgid "&apt-cache; &apt-conf;" +msgstr "" diff --git a/doc/po4a.conf b/doc/po4a.conf new file mode 100644 index 000000000..edf8d0357 --- /dev/null +++ b/doc/po4a.conf @@ -0,0 +1,50 @@ +# location of pot and po +[po_directory] po + +# Entities need to be present, even if not translated +[po4a_alias:entity] text opt:"-k 0" + +# define source file and translated file (one file per line) +[type: man] apt.8 $lang:$lang/apt.$lang.8 +[type: entity] apt.ent $lang:$lang/apt.ent +[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \ + add_$lang:$lang/addendum/xml_$lang.add +[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \ + add_$lang:$lang/addendum/xml_$lang.add +#[type: sgml] cache.sgml $lang:$lang/cache.$lang.sgml \ +# add_$lang::$lang/addendum/debiandoc_$lang.add +#[type: sgml] design.sgml $lang:$lang/design.$lang.sgml\ +# add_$lang::$lang/addendum/debiandoc_$lang.add +#[type: sgml] dpkg-tech.sgml $lang:$lang/dpkg-tech.$lang.sgml\ +# add_$lang::$lang/addendum/debiandoc_$lang.add +#[type: sgml] files.sgml $lang:$lang/files.$lang.sgml\ +# add_$lang::$lang/addendum/debiandoc_$lang.add +#[type: sgml] guide.sgml $lang:$lang/guide.$lang.sgml\ +# add_$lang::$lang/addendum/debiandoc_$lang.add +#[type: sgml] method.sgml $lang:$lang/method.$lang.sgml\ +# add_$lang::$lang/addendum/debiandoc_$lang.add +#[type: sgml] offline.sgml $lang:$lang/offline.$lang.sgml\ +# add_$lang::$lang/addendum/debiandoc_$lang.add + -- cgit v1.2.3-70-g09d2 From 095bdb6fe230a499ab150e55d514b938d2d2bbd7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 26 Aug 2009 17:29:29 +0200 Subject: [ Nicolas François ] * doc/ja/*, doc/po/ja.po: - remove the old ja man page translation and replace it with the new po4a-powered translation by KURASAWA Nozomu. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 + doc/ja/addendum/debiandoc_ja.add | 7 + doc/ja/addendum/xml_ja.add | 7 + doc/ja/apt-cache.ja.8.xml | 701 --- doc/ja/apt-cdrom.ja.8.xml | 255 - doc/ja/apt-config.ja.8.xml | 165 - doc/ja/apt-extracttemplates.ja.1.xml | 121 - doc/ja/apt-ftparchive.ja.1.xml | 1020 ---- doc/ja/apt-get.ja.8.xml | 900 ---- doc/ja/apt-key.ja.8.xml | 176 - doc/ja/apt-secure.ja.8.xml | 374 -- doc/ja/apt-sortpkgs.ja.1.xml | 110 - doc/ja/apt.conf.ja.5.xml | 809 --- doc/ja/apt.ent.ja | 328 -- doc/ja/apt_preferences.ja.5.xml | 940 ---- doc/ja/makefile | 32 +- doc/ja/manpage.refs | 4 - doc/ja/sources.list.ja.5.xml | 427 -- doc/po/ja.po | 9649 ++++++++++++++++++++++++++++++++++ 19 files changed, 9688 insertions(+), 6340 deletions(-) create mode 100644 doc/ja/addendum/debiandoc_ja.add create mode 100644 doc/ja/addendum/xml_ja.add delete mode 100644 doc/ja/apt-cache.ja.8.xml delete mode 100644 doc/ja/apt-cdrom.ja.8.xml delete mode 100644 doc/ja/apt-config.ja.8.xml delete mode 100644 doc/ja/apt-extracttemplates.ja.1.xml delete mode 100644 doc/ja/apt-ftparchive.ja.1.xml delete mode 100644 doc/ja/apt-get.ja.8.xml delete mode 100644 doc/ja/apt-key.ja.8.xml delete mode 100644 doc/ja/apt-secure.ja.8.xml delete mode 100644 doc/ja/apt-sortpkgs.ja.1.xml delete mode 100644 doc/ja/apt.conf.ja.5.xml delete mode 100644 doc/ja/apt.ent.ja delete mode 100644 doc/ja/apt_preferences.ja.5.xml delete mode 100644 doc/ja/manpage.refs delete mode 100644 doc/ja/sources.list.ja.5.xml create mode 100644 doc/po/ja.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e279633fc..f978eb367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,9 @@ apt (0.7.22.3) unstable; urgency=low * Cleaned up the first patch draft from KURASAWA Nozomu to finally get po4a support for translating the man pages. Many thanks to both for this excellent work! (Closes: #441608) + * doc/ja/*, doc/po/ja.po: + - remove the old ja man page translation and replace it with + the new po4a-powered translation by KURASAWA Nozomu. * doc/*.?.xml (manpages): - add contrib to author tags and also add refmiscinfo to fix warnings * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak: diff --git a/doc/ja/addendum/debiandoc_ja.add b/doc/ja/addendum/debiandoc_ja.add new file mode 100644 index 000000000..05d4cff3f --- /dev/null +++ b/doc/ja/addendum/debiandoc_ja.add @@ -0,0 +1,7 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry> + <refsect1><title>訳者 + 倉澤 望 nabetaro@debian.or.jp (2003-2006,2009), + Debian JP Documentation ML debian-doc@debian.or.jp + + + diff --git a/doc/ja/addendum/xml_ja.add b/doc/ja/addendum/xml_ja.add new file mode 100644 index 000000000..05d4cff3f --- /dev/null +++ b/doc/ja/addendum/xml_ja.add @@ -0,0 +1,7 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ + 訳者 + 倉澤 望 nabetaro@debian.or.jp (2003-2006,2009), + Debian JP Documentation ML debian-doc@debian.or.jp + + + diff --git a/doc/ja/apt-cache.ja.8.xml b/doc/ja/apt-cache.ja.8.xml deleted file mode 100644 index 1d30e224d..000000000 --- a/doc/ja/apt-cache.ja.8.xml +++ /dev/null @@ -1,701 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt-cache - 8 - - - - - apt-cache - - APT パッケージ操作ユーティリティ -- キャッシュ操作 - - - - - - apt-cache - - - - - add file - gencaches - showpkg pkg - showsrc pkg - stats - dump - dumpavail - unmet - search regex - show pkg - depends pkg - rdepends pkg - pkgnames prefix - dotty pkg - policy pkgs - madison pkgs - - - - - - 説明 - - apt-cache は APT のパッケージキャッシュに対して、 - さまざまな操作を行います。 - apt-cache は、システム状態の操作は行いませんが、 - パッケージのメタデータより検索したり、 - 興味深い出力を生成するといった操作を提供します。 - - - オプションや オプションを除き、 - 以下に挙げるコマンドが必要です。 - - - - add file(s) - add は、 - パッケージキャッシュに指定したパッケージインデックスファイルを追加します。 - デバッグ専用です。 - - - gencaches - - gencaches は、 - apt-get check と同じ動作を提供します。 - これは &sources-list; 内の取得元と - /var/lib/dpkg/statusから、 - ソースとパッケージのキャッシュを構築します。 - - - showpkg pkg(s) - - showpkg は、 - コマンドライン上に列挙したパッケージの情報を表示します。 - 後に続く引数はパッケージ名となります。 - 各パッケージについて、有効なバージョンと被依存関係を列挙し、 - さらにその各バージョンについて依存関係を表示します。 - (通常の) 依存関係とは、対象のパッケージが依存しているパッケージを指します。 - また、被依存関係とは、対象のパッケージに依存しているパッケージを指します。 - 従って、パッケージの依存関係は満たさなければなりませんが、 - 被依存関係は満たす必要はありません。 - 実例として、以下に apt-cache showpkg libreadline2 の - 出力を掲げます。 - - -Package: libreadline2 -Versions: 2.1-12(/var/state/apt/lists/foo_Packages), -Reverse Depends: - libreadlineg2,libreadline2 - libreadline2-altdev,libreadline2 -Dependencies: -2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null)) -Provides: -2.1-12 - -Reverse Provides: - - - - つまり、libreadline2 の version 2.1-12 は、 - libc5 と ncurses3.0 に依存していて、libreadline2 が動作するには、 - これらをインストールする必要があるということが判ります。 - 一方、libreadlineg2 と libreadline2-altdev は libreadline2 に依存しています。 - libreadline2 をインストールするためには、libc5, ncurses3.0, ldso を - すべてインストールしなければなりませんが、libreadlineg2 と - libreadline2-altdev はインストールする必要はありません。 - 出力の残りの部分の意味については、 - apt のソースコードを調べるのが最良でしょう。 - - - - statsstats - はキャッシュについての統計情報を表示します。 - それ以上、引数は必要ありません。以下の統計情報を表示します。 - - - パッケージ名総数は、 - キャッシュに存在するパッケージ数を表します。 - - - - 通常パッケージは、 - 公式の普通のパッケージ数を表します。 - これは、他のパッケージの依存関係で使用された名称で、それが一対一に対応 - するパッケージです。 - 大多数のパッケージはこのカテゴリに入ります。 - - - - 純粋仮想パッケージは、 - 仮想パッケージ名としてのみ存在するパッケージ - (仮想パッケージ名のみを「提供」し、 - 実際にはいかなるパッケージもその名称を持たない) の数を表します。 - 例えば、Debian GNU/Linux システムでは "mail-transport-agent" - は純粋仮想パッケージです。 - "mail-transport-agent" を提供するパッケージはいくつもありますが、 - "mail-transport-agent" という名称のパッケージはありません。 - - - - 単一仮想パッケージは、 - 特定の仮想パッケージ名を提供するパッケージが、 - ただ一つの場合の数を表します。 - 例えば、Debian GNU/Linux システムでは、"X11-text-viewer" - は仮想パッケージですが、"X11-text-viewer" を提供するパッケージは、 - xless パッケージのみということです。 - - - - 複合仮想パッケージは、 - その仮想パッケージ名を提供するパッケージが複数あるか、 - またパッケージ名と同じ仮想パッケージ名を持つパッケージ数を表します。 - 例えば、Debian GNU/Linux システムでは、 - debconf は実際のパッケージ名でもありますが、 - debconf-tiny によって提供もされています。 - - - - 欠落は、依存関係中には存在するのに、 - どのパッケージにも提供されていないパッケージ名の数を表します。 - このパッケージがあるということは、 - 全ディストリビューションにアクセスできていないか、 - (実ないし仮想) パッケージがディストリビューションからはずされてしまった可能性もあります。 - 通常では、構文が矛盾するとこのようになります。 - - - - 個別バージョン総数は、 - キャッシュに存在するパッケージのバージョンの数を表します。 - そのため、この値は最小でもパッケージ名総数と一致します。 - もし複数のディストリビューション (例 "stable" と "unstable" の両方) - を利用した場合、 - この値はパッケージ名総数よりもかなり大きい数になります。 - - - - 依存関係総数は、 - キャッシュにあるすべてのパッケージで要求された依存関係の数です。 - - - - - - showsrc pkg(s) - - showsrc は、 - 指定したパッケージ名に一致するソースパッケージを、すべて表示します。 - バイナリになるときの名称を宣言したレコードと同様に、 - すべてのバージョンについて表示します。 - - - dump - - dump は、 - キャッシュ内のパッケージそれぞれについて、短い一覧を表示します。 - 主にデバッグ用です。 - - - dumpavail - - dumpavail は、 - 標準出力に利用可能なものの一覧を出力します。 - &dpkg; と共に使用すると便利ですし、 - &dselect; でも使用されます。 - - - unmet - - unmet は、 - パッケージキャッシュ内にある、 - 不適当な依存関係の概要を表示します。 - - - show pkg(s) - - show は、 - dpkg --print-avail と同様の機能を実行します。 - これは、指定したパッケージのパッケージレコードの表示です。 - - - - search regex [ regex ... ] - - search は、与えられた正規表現によって、 - すべての利用可能なパッケージに対して全文検索を行います。 - パッケージ名と説明に対して検索を行い、 - パッケージ名と短い説明文を表示します。 - が与えられた場合、マッチしたパッケージに対し - show と同じ情報を出力します。 - が与えられた場合は、 - 説明文に対して検索を行わず、パッケージ名に対してのみ対象とします。 - - - 空白で区切った引数で、 - 複数の検索パターンの and をとることができます。 - - - depends pkg(s) - - depends は、 - パッケージが持っている依存関係と、 - その依存関係を満たす他のパッケージの一覧を表示します。 - - - rdepends pkg(s) - - rdepends は、 - パッケージが持つ被依存関係を一覧表示します。 - - - pkgnames [ prefix ] - - このコマンドは、 - システムでの各パッケージの名称を表示します。 - オプションの引数により、取得する一覧より先頭一致で抽出することができます。 - この出力はシェルのタブによる補完機能に使いやすく、 - また非常に速く生成されます。 - このコマンドは オプションと共に使用すると、 - 非常に便利です。 - - - dotty pkg(s) - - dotty は、 - コマンドライン上のパッケージ名から、 - GraphViz - パッケージの dotty コマンドで利用するのに便利な出力を生成します。 - 結果はパッケージの関係を表わす、ノード・エッジのセットで表現されます。 - デフォルトでは、すべての依存パッケージをトレースするので、 - 非常に大きい図が得られます。 - これは、APT::Cache::GivenOnly - オプションを設定して解除できます。 - - - 結果のノードは数種の形状をとります。 - 通常パッケージは四角、純粋仮想パッケージは三角、複合仮想パッケージは菱形、 - 六角形は欠落パッケージをそれぞれ表します。 - オレンジの四角は再帰が終了した「リーフパッケージ」、青い線は先行依存、 - 緑の線は競合を表します。 - - - 注意) dotty は、 - パッケージのより大きなセットのグラフは描けません。 - - - policy [ pkg(s) ] - - policy は、 - 設定ファイル関係の問題について、デバッグを支援します。 - 引数を指定しなかった場合、取得元ごとの優先順位を表示します。 - 一方、パッケージ名を指定した場合、 - 優先順の詳細情報を表示します。 - - - madison /[ pkg(s) ] - - apt-cache の madison - コマンドは、Debian アーカイブ管理ツール madison - の機能のサブセットで、出力フォーマットを真似ようとします。 - パッケージの利用可能バージョンを表形式で表示します。 - オリジナルの madison と違い、 - APT がパッケージ一覧を検索したアーキテクチャ - (APT::Architecture) - の情報を表示するだけです。 - - - - - - オプション - &apt-cmdblurb; - - - - - パッケージキャッシュを格納するファイルを選択します。 - パッケージキャッシュは、すべての操作で使用される一次キャッシュです。 - 設定項目 - Dir::Cache::pkgcache - - - - - ソースキャッシュを格納するファイルを選択します。 - このソースキャッシュは gencaches でのみ使用され、 - ここに解析された取得元のパッケージ情報が格納されています。 - パッケージキャッシュを構築する際に、ソースキャッシュは、 - 全パッケージファイルを再解析を避ける上で便利です。 - - 設定項目 - Dir::Cache::srcpkgcache - - - - - 静粛 - 進捗表示を省略し、 - ログをとるのに便利な出力を行います。 - 最大 2 つまで q を重ねることでさらに静粛にできます。 - また、 のように静粛レベルを指定して、 - 設定ファイルを上書きすることもできます。 - 設定項目 - quiet - - - - - 「重要」依存関係のみ表示 - unmet と共に使用します。 - これは「依存」関係と「先行依存」関係のみを表示するためです。 - 設定項目 - APT::Cache::Important - - - - - search 時に全パッケージレコードを表示します。 - 設定項目 - APT::Cache::ShowFull - - - - - 全利用可能バージョンのレコード全体を表示します。 - これはデフォルトの動作で、 - 無効にするには を使用してください。 - を指定すると、 - 候補バージョン (インストールの際に選択されるもの) だけ表示します。 - このオプションは、show コマンドでのみ適用できます。 - 設定項目 - APT::Cache::AllVersions - - - - - そのままキャッシュを使用するのではなく、 - 自動的にパッケージキャッシュを再生成します。これはデフォルトの動作で、 - 無効にするには を使用してください。 - 設定項目 - APT::Cache::Generate - - - - - 説明文ではなく、パッケージ名からのみ検索します。 - 設定項目 - APT::Cache::NamesOnly - - - - - pkgnames で、 - 仮想パッケージや欠落依存関係を含めた全名称を表示します。 - 設定項目 - APT::Cache::AllNames - - - - - depends や rdepends - で、指定した全パッケージを再帰的に一度に表示します。 - 設定項目 - APT::Cache::RecurseDepends - - - - - - depends や rdepends の出力を、 - 現在インストールされているパッケージに限定します。 - 設定項目 - APT::Cache::Installed - - - &apt-commonoptions; - - - - - - ファイル - - /etc/apt/sources.list - - パッケージの取得元。 - 設定項目 - Dir::Etc::SourceList - - - &statedir;/lists/ - - &sources-list; に指定した、 - パッケージリソースごとの状態情報格納エリア。 - 設定項目 - Dir::State::Lists - - - &statedir;/lists/partial/ - - 取得中状態情報格納エリア。 - 設定項目 - Dir::State::Lists (必然的に不完全) - - - - - - 関連項目 - &apt-conf;, &sources-list;, &apt-get; - - - - - 診断メッセージ - - apt-cache は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - - &manbugs; - &translator; - diff --git a/doc/ja/apt-cdrom.ja.8.xml b/doc/ja/apt-cdrom.ja.8.xml deleted file mode 100644 index bf84b4749..000000000 --- a/doc/ja/apt-cdrom.ja.8.xml +++ /dev/null @@ -1,255 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - 14 February 2004 - - - - apt-cdrom - 8 - - - - - apt-cdrom - - APT CDROM 管理ユーティリティ - - - - - - apt-cdrom - - - - - - add - ident - - - - - - 説明 - - apt-cdrom は利用可能な取得元として、 - APT のリストに新しい CDROM を追加するのに便利です。 - apt-cdrom は焼き損じを可能な限り補正し、 - ディスク構造の確認を助けます。また、インデックスファイルの確認を行います。 - - - - APT システムに手作業で CD を追加するのは難しいため、 - apt-cdrom が必要になります。 - その上、CD セットのディスクを 1 枚づつ、 - 焼き損じを補正できるか評価しなければなりません。 - - - - オプションや オプションを除き、 - 以下に挙げるコマンドが必要です。 - - - add - - add は、 - 新しいディスクを取得元リストに追加します。 - CDROM デバイスのアンマウント、ディスク挿入のプロンプトの表示の後に、 - ディスクのスキャンとインデックスファイルのコピーを行います。 - ディスクに正しい disk ディレクトリが存在しない場合、 - タイトルを入力するよう促します。 - - - - APT は、現在ドライブにあるディスクのトラックから取得した、 - CDROM ID を使用します。またその ID を、 - &statedir;/cdroms.list 内のデータベースで管理します。 - - - - - ident - - 格納されているファイル名と、 - 現在のディスクが同一かどうかをレポートする、デバッグツールです。 - - - - - - - - Options - &apt-cmdblurb; - - - - - マウントポイント - cdrom をマウントする場所を指定します。 - このマウントポイントは、 - /etc/fstab に正しく設定されている必要があります。 - 設定項目 - Acquire::cdrom::mount - - - - - - - ディスクの名前変更 - - 指定した名前でディスクのラベルを変更・更新します。このオプションにより、 - apt-cdrom が新しいラベルを入力するよう促します。 - 設定項目 - APT::CDROM::Rename - - - - - - - マウントなし - apt-cdrom が、 - マウントポイントにマウント・アンマウントしないようにします。 - 設定項目 - APT::CDROM::NoMount - - - - - - - 高速コピー - パッケージファイルが妥当であると仮定し、 - チェックを全く行いません。このオプションは、 - このディスクで以前 apt-cdrom を行っており、 - エラーを検出しなかった場合のみ使用すべきです。 - 設定項目 - APT::CDROM::Fast - - - - - - - 完全パッケージスキャン - - 古い Debian 1.1/1.2 のディスクは、パッケージファイルが違う場所にあるため、 - このオプションを使う必要があるかもしれません。 - CD をスキャンするのに非常に時間がかかりますが、 - 全パッケージファイルを抽出することができます。 - - - - - - - - - - 変更なし - &sources-list; ファイルの変更や、 - インデックスファイルの書き込みを行いません。 - とはいえ、すべてのチェックは行います。 - 設定項目 - APT::CDROM::NoAct - - - - - &apt-commonoptions; - - - - - - 関連項目 - &apt-conf;, &apt-get;, &sources-list; - - - - - 診断メッセージ - - apt-cdrom は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - - &manbugs; - &translator; - - diff --git a/doc/ja/apt-config.ja.8.xml b/doc/ja/apt-config.ja.8.xml deleted file mode 100644 index b1d90f5b5..000000000 --- a/doc/ja/apt-config.ja.8.xml +++ /dev/null @@ -1,165 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt-config - 8 - - - - - apt-config - - APT 設定取得プログラム - - - - - - apt-config - - - - - shell - dump - - - - - - 説明 - - apt-config は、 - APT スイートの様々な所で一貫した設定を行うために使用する、内部ツールです。 - スクリプトアプリケーションで使いやすい方法で、 - メイン設定ファイル /etc/apt/apt.conf - にアクセスします。 - - - や オプションを除き、 - 以下に挙げるコマンドが必要です。 - - - shell - - - shell は、シェルスクリプトから設定情報にアクセスするのに使用します。 - 引数として、まずシェル変数、次に取得したい設定値をペアで与えます。 - 出力として、現在の値ごとにシェル代入コマンドの一覧を表示します。 - シェルスクリプト内では、以下のようにしてください。 - - - -OPTS="-f" -RES=`apt-config shell OPTS MyApp::options` -eval $RES - - - - これは、MyApp::options の値をシェル環境変数 $OPTS にセットします。 - デフォルト値は となります。 - - - 設定項目は /[fdbi] を後ろに付けられます。 - f はファイル名を、d はディレクトリを、b は true か false を、 - i は整数を返します。 - 返り値ごとに内部で正規化と検証を行います。 - - - - - dump - - - 設定箇所の内容を表示するだけです。 - - - - - - - - オプション - &apt-cmdblurb; - - - - &apt-commonoptions; - - - - - - 関連項目 - &apt-conf; - - - - - 診断メッセージ - - apt-config は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - - &manbugs; - &translator; - - - diff --git a/doc/ja/apt-extracttemplates.ja.1.xml b/doc/ja/apt-extracttemplates.ja.1.xml deleted file mode 100644 index 079c89402..000000000 --- a/doc/ja/apt-extracttemplates.ja.1.xml +++ /dev/null @@ -1,121 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt-extracttemplates - 1 - - - - - apt-extracttemplates - - Debian パッケージから DebConf 設定とテンプレートを抽出するユーティリティ - - - - - - apt-extracttemplates - - - file - - - - - 説明 - - apt-extracttemplates は、 - 入力に複数の Debian パッケージをとり、 - 関連する設定スクリプトとテンプレートファイルを - (一時ディレクトリに) 出力します。 - 設定スクリプト・テンプレートファイルを持つ、 - 渡されたパッケージそれぞれに対し、以下の形式で 1 行ずつ出力します。 - package version template-file config-script - - テンプレートファイルや、設定スクリプトは、 - -t や --tempdir で指定した一時ディレクトリ - (APT::ExtractTemplates::TempDir) に書き出され、 - ファイル名は、package.template.XXXX や - package.config.XXXX と言った形になります。 - - - - オプション - &apt-cmdblurb; - - - - - - 抽出した debconf テンプレートファイルや設定スクリプトを書き出す、 - 一時ディレクトリ。 - 設定項目 - APT::ExtractTemplates::TempDir - - - &apt-commonoptions; - - - - - - - - 関連項目 - &apt-conf; - - - - 診断メッセージ - apt-extracttemplates は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - &manbugs; - &translator; - - diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml deleted file mode 100644 index be6bbd767..000000000 --- a/doc/ja/apt-ftparchive.ja.1.xml +++ /dev/null @@ -1,1020 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt-ftparchive - 1 - - - - - apt-ftparchive - - インデックスファイル生成ユーティリティ - - - - - - apt-ftparchive - - - - - - - - - packagespathoverridepathprefix - sourcespathoverridepathprefix - contents path - release path - generate config-file section - clean config-file - - - - - - 説明 - - apt-ftparchive は、 - APT が取得元にアクセスするのに必要な、 - インデックスファイルを生成するコマンドラインツールです。 - インデックスファイルは、元のサイトの内容に基づき生成されるべきです。 - - - apt-ftparchive は、 - &dpkg-scanpackages; プログラムのスーパーセットで、 - packages コマンド経由で機能全体を取り込んでいます。 - また、contents ファイルジェネレータ contents と - 完全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。 - - - 本質的に apt-ftparchive は、 - .deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。 - また、&gzip; 以外のいかなる外部プログラムにも依存しません。 - すべて生成する際には、 - ファイル変更点の検出と希望した圧縮出力ファイルの作成を自動的に実行します。 - - - オプションや オプションを除き、 - 以下に挙げるコマンドが必要です。 - - - packages - - - packages コマンドは、 - ディレクトリツリーからパッケージファイルを生成します。 - 与えられたディレクトリから再帰検索し、.deb ファイルを取得します。 - またパッケージレコードを標準出力にそれぞれ出力します。 - このコマンドは、&dpkg-scanpackages; とほぼ同じです。 - - - オプションで、 - キャッシュ DB を指定できます。 - - - sources - - - sources コマンドは、 - ディレクトリツリーからソースインデックスファイルを生成します。 - 与えられたディレクトリから再帰検索し、.dsc ファイルを取得します。 - またソースレコードを標準出力にそれぞれ出力します。 - このコマンドは、&dpkg-scansources; とほぼ同じです。 - - - override ファイルを指定した場合、 - src 拡張子がついたソースオーバーライドファイルを探します。 - 使用するソースオーバーライドファイルを変更するのには、 - --source-override オプションを使用します。 - - - contents - - - contents コマンドは、 - ディレクトリツリーからコンテンツファイルを生成します。 - 与えられたディレクトリから再帰検索し、.deb ファイルを取得します。 - またファイルごとにファイル一覧を読み取ります。 - その後、パッケージに対応するファイル一覧を標準出力にソートして出力します。 - ディレクトリは出力に含まれません。 - 複数のパッケージが同じファイルを持つ場合、 - パッケージ名をカンマ区切りで出力します。 - - - オプションで、 - キャッシュ DB を指定できます。 - - - release - - - release コマンドは、 - ディレクトリツリーから Release ファイルを生成します。 - 与えられたディレクトリから、Packages, Packages.gz, Packages.bz2, Sources, - Sources.gz, Sources.bz2, Release, md5sum.txt - といったファイルを再帰検索します。 - その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを含んだ - Release ファイルを、標準出力に書き出します。 - - - Release ファイルの追加メタデータフィールドの値は、 - APT::FTPArchive::Release 以下の相当する値 - (例: APT::FTPArchive::Release::Origin) をとります。 - サポートするフィールドは、 - Origin, Label, Suite, - Version, Codename, Date, - Architectures, Components, Description です。 - - - - generate - - - generate コマンドは、 - cron スクリプトから実行できるよう設計されており、 - 与えられた設定ファイルに従ってインデックスを生成します。 - 設定言語は、必要な設定を維持する簡単な方法を提供すると共に、 - インデックスファイルをどのディレクトリから作成するかを指定する、 - 柔軟な方法を提供します。 - - - clean - - - clean コマンドは、 - 設定ファイルで与えられたデータベースを、 - もう必要ないレコードを削除して整理します。 - - - - - - generate 設定 - - - generate コマンドは、 - 生成するアーカイブに関する記述をした設定ファイルを使用します。 - 設定ファイルは、bind 8 や dhcpd といった ISC ツールに見られるような、 - ISC 設定フォーマットに従います。 - &apt-conf; に、文法の説明があります。 - generate 設定はセクション法で解析しますが、 - &apt-conf; はツリー法で解析するのに注意してください。 - これはスコープタグの扱い方に違いがあるだけです。 - - - - generate 設定には 4 個の独立したセクションがあります。 - 以下それぞれ説明します。 - - - Dir セクション - - - Dir セクションは、 - 生成プロセスで必要なファイルを配置するための、 - 標準ディレクトリを定義します。 - このディレクトリは、完全な絶対パスを生成するため、 - 後のセクションで定義される相対パスの前に結合します。 - - ArchiveDir - - - FTP アーカイブのルートを指定します。 - 標準的な Debian 設定では、このディレクトリには - ls-LR と dist ノードがあります。 - - - OverrideDir - - - オーバーライドファイルの場所を指定します。 - - - CacheDir - - - キャッシュファイルの場所を指定します。 - - - FileListDir - - - FileList 設定が以下で使用されている場合、 - ファイルリストファイルの場所を指定します。 - - - - - - Default セクション - - - Default セクションではデフォルト値を指定します。 - また、生成器の動作を制御する設定も行います。 - 他のセクションでは、ここにあるデフォルト値を、 - セクションごとの設定で上書きします。 - - Packages::Compress - - - Package インデックスファイルのデフォルトの圧縮方法を設定します。 - 少なくともひとつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、 - 空白区切りの文字列です。 - 圧縮方法のデフォルトはすべて '. gzip' です。 - - - Packages::Extensions - - - パッケージファイル拡張子のデフォルト値を列挙します。 - このデフォルト値は '.deb' です。 - - - Sources::Compress - - - Packages::Compress と同様に、 - Sources ファイルの圧縮方法を指定します。 - - - Sources::Extensions - - - ソースファイル拡張子のデフォルト値を列挙します。 - このデフォルト値は '.dsc' です。 - - - Contents::Compress - - - Packages::Compress と同様に、 - Contents ファイルの圧縮方法を指定します。 - - - DeLinkLimit - - - 実行するごとに delink (及びハードリンクの置き換え) する量を、 - キロバイト単位で指定します。セクションごとの - External-Links 設定と合わせて使います。 - - - FileMode - - - 作成したインデックスファイルのモードを指定します。 - デフォルトは 0644 です。全インデックスファイルは、 - umask を無視してこのモードを使用します。 - - - - - - TreeDefault セクション - - - 特定の Tree セクションのデフォルトを設定します。 - これらの変数はすべて置換変数であり、 - 文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値に展開します。 - - - MaxContentsChange - - - 日毎に生成する contents ファイルをキロバイト単位で設定します。 - contents ファイルをラウンドロビンし、数日経つとすべて再生成します。 - - - ContentsAge - - - 変更がない contents ファイルをチェックする日数を指定します。 - この制限を越えた contents ファイルの mtime を、更新します。 - パッケージファイルが変更されても、 - [例えば上書き編集で] contents ファイルが更新されないような場合、 - こういったことが発生します。 - 新しい .deb ファイルをインストールしたい場合、保留を解除でき、 - 少なくとも新しいファイルが必要です。 - デフォルトは 10 で、単位は日です。 - - - Directory - - - .deb ディレクトリツリーの先頭を設定します。デフォルトは - $(DIST)/$(SECTION)/binary-$(ARCH)/ です。 - - - SrcDirectory - - - ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは - $(DIST)/$(SECTION)/source/ です。 - - - Packages - - - Packages ファイルの出力先を設定します。デフォルトは - $(DIST)/$(SECTION)/binary-$(ARCH)/Packages です。 - - - Sources - - - Packages ファイルの出力先を設定します。デフォルトは - $(DIST)/$(SECTION)/source/Sources です。 - - - InternalPrefix - - - 外部リンクではなく、内部リンクと見なす判断材料となる、 - パスのプレフィックスを設定します。デフォルトは、 - $(DIST)/$(SECTION)/ です。 - - - Contents - - - Contents ファイルの出力先を設定します。デフォルトは、 - $(DIST)/Contents-$(ARCH) です。 - 複数の Packages ファイルを ひとつの Contents ファイルにまとめられる設定 - (デフォルト) の場合、apt-ftparchive - は自動でパッケージファイルをまとめます。 - - - Contents::Header - - - contents の出力に付けるヘッダファイルを設定します。 - - - BinCacheDB - - - このセクションで使用するバイナリキャッシュデータベースを設定します。 - 複数のセクションで同じデータベースを共有できます。 - - - FileList - - - ディレクトリツリーを走査する代わりに、apt-ftparchive - が読み込むファイル一覧ファイルを指定します。 - 相対ファイル名は、アーカイブディレクトリが先頭につきます。 - - - SourceFileList - - - ディレクトリツリーを走査する代わりに、apt-ftparchive - が読み込むファイル一覧ファイルを指定します。 - 相対ファイル名は、アーカイブディレクトリが先頭につきます。 - ソースインデックスを処理する際に使用します。 - - - - - - Tree セクション - - - Tree セクションでは、 - ベースディレクトリからの標準 Debian ファイルツリー、 - ベースディレクトリの複数のセクション、 - 最終的にはセクションごとの複数のアーキテクチャを定義します。 - 使用する正確なパスは、Directory 変数で定義されます。 - - - Tree セクションは、 - $(DIST) 変数で設定されているスコープタグをとり、 - ツリーのルート (ArchiveDirが先頭につくパス) - を定義します。 - 通常、この設定は dists/woody のようになります。 - - - TreeDefault セクションで定義される設定はすべて、 - 3 個の新しい変数と同様に、 - Tree セクションで使用できます。 - - - Tree セクションを処理する際、 - apt-ftparchive は以下のような操作を行います。 - -for i in Sections do - for j in Architectures do - Generate for DIST=scope SECTION=i ARCH=j - - - - Sections - - - distribution 以下に現れるセクションを、空白区切りで指定したリストです。 - 通常、main contrib non-freeのようになります。 - - - Architectures - - - search セクション以下に現れるアーキテクチャを、 - 空白区切りで指定したリストです。 - 特殊アーキテクチャ 'source' は、 - ソースアーカイブのツリーであることを示します。 - - - BinOverride - - - バイナリオーバーライドファイルを設定します。 - このオーバーライドファイルには、セクション、優先度、 - メンテナのアドレスといった情報が含まれています。 - - - SrcOverride - - - ソースオーバーライドファイルを設定します。 - このオーバーライドファイルには、 - セクションの情報が含まれています。 - - - ExtraOverride - - - バイナリ特別オーバーライドファイルを設定します。 - - - SrcExtraOverride - - - ソース特別オーバーライドファイルを設定します。 - - - - - - BinDirectory セクション - - - bindirectory セクションでは、 - 特殊な構造を持たないバイナリディレクトリツリーを定義します。 - スコープタグはバイナリディレクトリの場所を指定し、 - 設定は、変数展開のない Tree セクションや - SectionArchitecture 設定に似ています。 - - Packages - - - Packages ファイルの出力先を設定します。 - - - SrcPackages - - - Sources ファイルの出力先を設定します。 - 少なくとも Packages や SrcPackages - は設定されていなければなりません。 - - - Contents - - - Contents ファイルの出力先を設定します。(オプション) - - - BinOverride - - - バイナリオーバーライドファイルを設定します。 - - - SrcOverride - - - ソースオーバーライドファイルを設定します。 - - - ExtraOverride - - - バイナリ特別オーバーライドファイルを設定します。 - - - SrcExtraOverride - - - ソース特別オーバーライドファイルを設定します。 - - - BinCacheDB - - - キャッシュ DB を設定します。 - - - PathPrefix - - - 全出力パスに付加するパス。 - - - FileList, SourceFileList - - - ファイル一覧ファイルを指定します。 - - - - - - - - バイナリオーバーライドファイル - - バイナリオーバーライドファイルは、 - &dpkg-scanpackages; と完全に互換性があります。 - ここには、空白区切りでフィールドが 4 個あります。 - 先頭のフィールドはパッケージ名、 - 2 番目のフィールドはパッケージに強制する優先度、 - 3 番目のフィールドはパッケージに強制するセクション、 - 最後のフィールドはメンテナ順列フィールドです。 - - メンテナフィールドは一般的には、 - old [// oldn]* => new - という形式か、単純に - new - となります。 - 最初の形式は、// で区切られた古い email アドレスのリストを許可します。 - この形式がある場合は、メンテナフィールドになるよう new に置換してください。 - 2 番目の形式は無条件にメンテナフィールドに置換します。 - - - - - ソースオーバーライドファイル - - - ソースオーバーライドファイルは、 - &dpkg-scansources; と完全に互換性があります。 - ここには、空白区切りでフィールドが 2 個あります。 - 先頭のフィールドはソースパッケージ名、 - 2 番目のフィールドは割り当てるセクションです。 - - - - 特別オーバーライドファイル - - - 特別オーバーライドファイルは、 - 出力中に任意のタグを追加・置換できるようにします。 - 3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。 - - - - オプション - &apt-cmdblurb; - - - - - - MD5 sum を生成します。デフォルトで on になっており、 - off にすると生成したインデックスファイルに MD5Sum フィールドがありません。 - 設定項目 - APT::FTPArchive::MD5 - - - - - - バイナリキャッシュ DB を使用します。 - generate コマンドには影響しません。 - 設定項目 - APT::FTPArchive::DB - - - - - - 静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。 - 最大 2 つまで q を重ねることでより静粛にできます。 - また、 のように静粛レベルを指定して、 - 設定ファイルを上書きすることもできます。 - 設定項目 - quiet - - - - - - Delink を実行します。 - External-Links 設定を使用している場合、 - このオプションはファイルの delink を有効にします。 - デフォルトは on で、 - off にするには としてください。 - 設定項目 - APT::FTPArchive::DeLinkAct - - - - - - contents の生成を行います。このオプションを指定し、 - パッケージインデックスをキャッシュ DB と共に生成する際、 - ファイルリストを後で使用するように、抽出し DB に格納します。 - generate コマンドを使用する際、 - このオプションでいずれの Contents ファイルも作成できます。 - デフォルトは on です。 - 設定項目 - APT::FTPArchive::Contents - - - - - - sources コマンドで使用する、 - ソースオーバーライドファイルを選択します。 - 設定項目 - APT::FTPArchive::SourceOverride - - - - - - キャッシュデータベースを読み取り専用にします。 - 設定項目 - APT::FTPArchive::ReadOnlyDB - - - &apt-commonoptions; - - - - - -サンプル - - -バイナリパッケージ (.deb) があるディレクトリの -Packages ファイルを生成するには、以下のようにします。 - - -apt-ftparchive packages directory | gzip > Packages.gz - - - - - - 関連項目 - &apt-conf; - - - - 診断メッセージ - - apt-ftparchive は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - &manbugs; - &translator; - - diff --git a/doc/ja/apt-get.ja.8.xml b/doc/ja/apt-get.ja.8.xml deleted file mode 100644 index f503b89ef..000000000 --- a/doc/ja/apt-get.ja.8.xml +++ /dev/null @@ -1,900 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt-get - 8 - - - - - apt-get - - APT package handling utility -- コマンドラインインターフェース - - - - - - apt-get - - - - - update - upgrade - dselect-upgrade - install pkg - remove pkg - source pkg - build-dep pkg - check - clean - autoclean - - - - - - 説明 - - apt-get は、 - パッケージを操作するコマンドラインツールで、 - APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。 - 「フロントエンド」インターフェースには、dselect(8), - aptitude, synaptic, gnome-apt, wajig などがあります。 - - - オプションや オプションを除き、 - 以下に挙げるコマンドが必要です。 - - - update - - updateは、 - 取得元からパッケージインデックスファイルの再同期を行うのに使用します。 - 利用可能なパッケージのインデックスは、 - /etc/apt/sources.list に記述した場所から取得します。 - 例えば Debian アーカイブを利用する際、 - このコマンドが Packages.gz ファイルを検索することで、 - 新規または更新されたパッケージの情報が利用可能となります。 - update は、upgrade や - dist-upgrade を行う前に常に実行してください。 - 前もってパッケージファイルのサイズを知ることができないため、 - 全体の進捗メータは正しく表示されません。 - - - upgrade - - upgrade は、 - 現在システムにインストールされている全パッケージの最新バージョンを、 - /etc/apt/sources.list - に列挙した取得元からインストールするのに使用します。 - 現在インストール中のパッケージに新しいバージョンがあれば更新しますが、 - いかなる時も現在インストール中のパッケージの削除は行いません。 - 対象のパッケージが、 - 他のパッケージのインストール状態を変更せずに更新できない場合は、 - 現在のバージョンのままとなります。 - 最初に update を実行しておき、 - apt-get にパッケージの新しいバージョンがあることを - 知らせる必要があります。 - - - dselect-upgrade - - dselect-upgrade は、 - 伝統的な Debian GNU/Linux パッケージ管理フロントエンドの &dselect; - と共に使用されます。 - dselect-upgrade は、 - &dselect; で作られた利用可能パッケージの - Status フィールドの変更を追跡し、 - その状態を反映させるのに必要なアクションを実行します。 - (例えば、古いパッケージの削除や新しいパッケージのインストールなど) - - - - dist-upgrade - - dist-upgrade は、 - upgrade の機能に加え、 - 新バージョンのパッケージに対する依存関係の変更を知的に操作します。 - apt-get は「洗練された」競合解決システムを持ち、 - 必要とあらば比較的重要でないパッケージを犠牲にして、 - 最重要パッケージの更新を試みます。 - /etc/apt/sources.list ファイルには、 - 必要なパッケージファイルを検索する場所のリストが含まれています。 - 特定のパッケージ向けに、一般的な設定を上書きする機構については、 - &apt-preferences; をご覧ください。 - - - install - - install の後には、 - インストールするパッケージを 1 つ以上指定します。 - 指定するパッケージは、完全なファイル名ではなくパッケージ名です。 - (例えば Debian GNU/Linux システムでは、 - libc6_1.9.6-2.deb ではなく libc6 を引数として与えます) - インストールするよう指定したすべてのパッケージに対し、 - 検索・インストールを行います。 - /etc/apt/sources.list ファイルを、 - 要求するパッケージの場所を特定するのに使用します。 - パッケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、 - そのパッケージがインストールされていれば削除します。 - 同様に、インストールするパッケージを明示するのにプラス記号も使用できます。 - この記号は apt-get の競合解決システムの判断に利用されるかもしれません。 - - - パッケージにイコール記号とバージョンを続けることで、 - 選択したバージョンのパッケージをインストールすることができます。 - つまり、指定のバージョンのパッケージをインストールするように選択する、 - ということです。 - 別の方法としては、ディストリビューションを特定するのに、 - パッケージ名に続けて、 - スラッシュとディストリビューションのバージョンやアーカイブ名 - (stable, testing, unstable) を記述できます。 - - - バージョン選択機構はダウングレード時にも使用できるため、 - 注意して使用しなければなりません。 - - - 最後に、&apt-preferences; 機構により、 - 特定のパッケージに対するインストールポリシーを作成できます。 - - - 構文に '.', '?', '*' を含み、パッケージ名がマッチしなかった場合、 - POSIX 正規表現であると見なし、 - データベース内の全パッケージ名に対して適用します。 - マッチしたパッケージすべてがインストール(もしくは削除)されます。 - 'lo.*' のような文字列は、 - 'how-lo' や 'lowest' にマッチすることに注意してください。 - そうしたくなければ、'^' や '$' を付けるか、 - もっと詳しい正規表現を指定してください。 - - - remove - - remove は、 - パッケージが削除されることを除き、install と同様です。 - プラス記号がパッケージ名に (間に空白を含まずに) 付加されると、 - 識別されたパッケージを、削除ではなくインストールします。 - - - source - - source は、 - ソースパッケージを取得するのに apt-get します。 - APT はどのソースパッケージを取得するか決定するよう、 - 利用可能なパッケージを検討します。 - その後、最新の利用可能なソースパッケージを見つけ、 - カレントディレクトリへダウンロードします。 - バイナリパッケージとは別に &sources-list; ファイルの - deb-src 行から、ソースパッケージを追跡します。 - これは、インストールした (またはインストールできる) パッケージと、 - 取得元を変えることができることを示しています。 - --compile オプションが指定された場合、dpkg-buildpackage を用いて - バイナリ .deb ファイルへコンパイルを行います。 - --download-only の場合はソースパッケージを展開しません。 - - - パッケージと同様に、 - ソース名の後ろにイコールと取得したいバージョンを置くと、 - 指定したバージョンのソースを取得できます。 - APT::Get::Only-Source - オプションが暗黙のうちに有効になっているため、 - ソースパッケージ名とバージョンに厳密に一致させています。 - - - tar ball はカレントディレクトリにのみダウンロードされ、 - カレントディレクトリに展開されることに注意してください。 - - - build-dep - - build-dep は、 - ソースパッケージの構築依存関係を満たすように、 - パッケージのインストール・削除を行います。 - - - check - - check は、 - パッケージキャッシュの更新や壊れた依存関係をチェックする診断ツールです。 - - - clean - - clean は、 - 取得したパッケージのローカルリポジトリを掃除します。 - &cachedir;/archives/ と - &cachedir;/archives/partial/ - からロックファイル以外すべて削除します。 - APT が &dselect; から呼ばれるときには、 - 自動的に clean が実行されます。 - dselectを使用しない場合は、ディスクスペースを解放するため、時々 - apt-get clean を実行したくなるでしょう。 - - - autoclean - - clean と同様に、 - autoclean は取得したパッケージのローカルリポジトリを掃除します。 - 違いは、もうダウンロードされることがないパッケージファイルや、 - ほとんど不要なパッケージファイルのみを削除することです。 - このため、長い期間、キャッシュが管理できずに肥大化することなく、 - 維持することができます。 - 設定オプション APT::Clean-Installed に - off をセットしていれば、 - インストール済のパッケージファイルが削除されるのを防げます。 - - - - - - オプション - &apt-cmdblurb; - - - - - ダウンロードのみ - パッケージファイルの取得のみを行い、 - 展開・インストールを行いません。 - 設定項目 - APT::Get::Download-Only - - - - - 修復 - 依存関係が壊れたシステムの修正を試みます。 - このオプションを install や remove と一緒に使うときは、 - パッケージを指定しなくてもかまいません。 - どのパッケージを指定しても、完全に問題を解決します。APT 自体は、 - システムに存在する壊れたパッケージ依存関係を許すことができないので、 - 初めて APT を実行する場合、このオプションが必要になることがあります。 - システムの依存関係構造にかなり問題がある場合は、 - 手動で修正するよう要求することもあります。 - (通常は、問題のあるパッケージを取り除くのに &dselect; や - dpkg --remove を使用します) - このオプションを オプションと同時に使用すると、 - エラーになる状況があるかもしれません。 - 設定項目 - APT::Get::Fix-Broken - - - - - - 欠落パッケージの無視 - パッケージが取得できなかったり、 - (パッケージの破損で) 取得した後の整合性チェックを通らなかった場合、 - そのパッケージの処理を保留し最後まで処理を続けます。 - このオプションを オプションと同時に使用すると、 - エラーになる状況があるかもしれません。 - パッケージをインストールするよう選択している場合 - (特にコマンドラインでの操作時) や、 - ダウンロードできなかった場合に、なにも表示せず保留することになります。 - 設定項目 - APT::Get::Fix-Missing - - - - - パッケージのダウンロードを無効にします。 - これはすでにダウンロードした .deb に対してのみ APT を行う場合に、 - と併せて使うのがよいでしょう。 - 設定項目 - APT::Get::Download - - - - - 静粛 - 進捗表示を省略し、 - ログをとるのに便利な出力を行います。 - 最大 2 つまで q を重ねることでより静粛にできます。 - また、 のように静粛レベルを指定して、 - 設定ファイルを上書きすることもできます。 - 静粛レベル 2 は を含んでいることに注意してください。 - APT が意図しない決定を行うかもしれないので -d, --print-uris, -s のような - 操作を行わないオプションをつけずに -qq を使用するべきではありません。 - 設定項目 - quiet - - - - - - - - - - 動作なし - なにが起こるのかのシミュレーションを行い、 - 実際にはシステムの変更を行いません。 - 設定項目 - APT::Get::Simulate - - - シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、 - 設定 (Conf)、削除 (Remv)、展開 (Inst) を表示します。 - 角カッコは壊れたパッケージを表し、(まれに) - 空の角カッコは大した問題ではないことを表します。 - - - - - - プロンプトへの自動承諾 - すべてのプロンプトに自動的に - "yes" と答え、非対話的に実行します。 - 保留したパッケージの状態を変更したり、 - 必須パッケージを削除するような不適切な状況の場合、 - apt-get は処理を中断します。 - 設定項目 - APT::Get::Assume-Yes - - - - - 更新パッケージ表示 - - 更新される全パッケージを一覧表示します。 - 設定項目 - APT::Get::Show-Upgraded - - - - - 更新・インストールするパッケージのヴァージョンを、 - すべて表示します。 - 設定項目 - APT::Get::Show-Versions - - - - - - ソースパッケージをダウンロード後、コンパイルします。 - 設定項目 - APT::Get::Compile - - - - - 保留パッケージの無視 - パッケージの保留指示を無視して - apt-get を行います。 - dist-upgrade と共に、 - 大量のパッケージを保留の解除をするのに使用すると便利です。 - 設定項目 - APT::Ignore-Hold - - - - - パッケージ更新なし - install - と同時に使用すると、no-upgrade は、 - 指定したパッケージがすでにインストールしてある場合に更新を行いません。 - 設定項目 - APT::Get::Upgrade - - - - - 強制承諾 - - APT が何か損傷を与えかねない動作をしようとした場合でも、 - 確認の入力なしで実行してしまう危険なオプションです。 - よほどの状況でなければ、使用しない方がいいでしょう。 - force-yes は、あなたのシステムを破壊しかねません! - 設定項目 - APT::Get::force-yes - - - - - インストールするファイルを取得する代わりに、 - その URI を表示します。 - URI には、パス、対象ファイル名、ファイルサイズ、 - 予測される md5 ハッシュが含まれています。 - 出力したファイル名が、 - 常にリモートサイトのファイル名と一致するわけではない、 - ということに注意してください! - これは source コマンド、 - update コマンドでも動作します。 - update で使用したときには、 - MD5 やファイルサイズを含みません。 - このとき、圧縮ファイルの展開はユーザの責任において行ってください。 - 設定項目 - APT::Get::Print-URIs - - - - - 削除する際、「削除」ではなく「完全削除」を行います。 - 「完全削除」を行うと指示したパッケージ名の後には、 - アスタリスク ("*") が付きます。 - 設定項目 - APT::Get::Purge - - - - - すでに最新版がインストールされていても、 - パッケージを再インストールします。 - 設定項目 - APT::Get::ReInstall. - - - - - この機能はデフォルトで ON になっています。 - OFF にするには --no-list-cleanup としてください。 - ON の場合、 - apt-get は古くなったファイルを確実に消去するため、 - 自動的に &statedir;/lists の中身を管理します。 - これを OFF にするのは、取得元リストを頻繁に変更する時ぐらいでしょう。 - 設定項目 - APT::Get::List-Cleanup. - - - - - - - このオプションは、 - ポリシーエンジンへのデフォルト入力を制御します。 - これは、指定されたリリース文字列を使用し、 - デフォルト pin を優先度 990 で作成することです。 - 優先ファイルはこの設定を上書きします。 - 要するにこのオプションで、 - どの配布パッケージを取得するかを簡単に管理します。 - 一般的な例としては、 - や でしょう。 - 設定項目 - APT::Default-Release - &apt-preferences; のマニュアルページもご覧ください。 - - - - - - 「重要でない」操作のみを行います。 - これは論理的に の仲間と見なせます。 - は質問にすべて yes と答えますが、 - はすべて no と答えます。 - 設定項目 - APT::Get::Trivial-Only - - - - - パッケージが削除される状況になったとき、 - プロンプトを表示せず中断します。 - 設定項目 - APT::Get::Remove - - - - - source コマンドと - build-dep コマンドでのみ意味があります。 - 指定されたソース名がバイナリテーブルにマップされないようにします。 - これは、このオプションを指定すると、 - バイナリパッケージ名を受け付けて対応するソースパッケージを探すのではなく、 - 引数にソースパッケージ名しか受け付けなくなる、ということです。 - 設定項目 - APT::Get::Only-Source - - - - - ソースアーカイブの diff ファイルや - tar ファイルのダウンロードのみを行います。 - 設定項目 - APT::Get::Diff-Only, - APT::Get::Tar-Only - - - - - 構築依存関係の解決を、 - アーキテクチャに依存したもののみ行います。 - 設定項目 - APT::Get::Arch-Only - - - - - パッケージを確認できない場合に無視し、 - それについて質問しません。 - pbuilder のようなツールで便利です。 - 設定項目 - APT::Get::AllowUnauthenticated - - - - &apt-commonoptions; - - - - - - ファイル - - /etc/apt/sources.list - - パッケージの取得元。 - 設定項目 - Dir::Etc::SourceList - - - /etc/apt/apt.conf - - APT 設定ファイル。 - 設定項目 - Dir::Etc::Main - - - /etc/apt/apt.conf.d/ - - APT 設定ファイルの断片。 - 設定項目 - Dir::Etc::Parts - - - /etc/apt/preferences - - バージョン優先ファイル。 - ここに "pin" の設定を行います。 - つまり、別々の取得元や異なるディストリビューションのバージョンの、 - どこからパッケージを取得するかを設定します。 - 設定項目 - Dir::Etc::Preferences - - - &cachedir;/archives/ - - 取得済みパッケージファイル格納エリア。 - 設定項目 - Dir::Cache::Archives - - - &cachedir;/archives/partial/ - - 取得中パッケージファイル格納エリア。 - 設定項目 - Dir::Cache::Archives (必然的に不完全) - - - &statedir;/lists/ - - &sources-list; のパッケージリソース特有の状態情報格納エリア。 - 設定項目 - Dir::State::Lists - - - &statedir;/lists/partial/ - - 取得中の状態情報格納エリア。 - 設定項目 - Dir::State::Lists (必然的に不完全) - - - - - - 関連項目 - - &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, - &apt-conf;, &apt-config;, - &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto - - - - 診断メッセージ - - apt-get は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - &manbugs; - &translator; - - diff --git a/doc/ja/apt-key.ja.8.xml b/doc/ja/apt-key.ja.8.xml deleted file mode 100644 index 732ca9b1c..000000000 --- a/doc/ja/apt-key.ja.8.xml +++ /dev/null @@ -1,176 +0,0 @@ - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-key - 8 - - - - - apt-key - - APT キー管理ユーティリティ - - - - - - apt-key - command/ - - - - - - 説明 - - - apt-key は、 - apt が パッケージを認証するのに使用するキーの一覧を管理するのに使用します。 - このキーで認証されたパッケージは、信頼するに足ると見なせるでしょう。 - - - - -コマンド - - add filename - - - - - 信頼キー一覧に新しいキーを追加します。 - このキーは filename から読み込みますが、 - filename を - とすると、 - 標準入力から読み込みます。 - - - - - - del keyid - - - - - 信頼キー一覧からキーを削除します。 - - - - - - - list - - - - - 信頼キーを一覧表示します。 - - - - - - - update - - - - - Debian アーカイブキーで、ローカルキーリングを更新し、 - もう有効でないキーをキーリングから削除します。 - - - - - - - - - - ファイル - - /etc/apt/trusted.gpg - - ローカル信頼キーのキーリング。 - 新しいキーはここに追加されます。 - - - /etc/apt/trustdb.gpg - - アーカイブキーのローカル信頼データベース - - - /usr/share/keyrings/debian-archive-keyring.gpg - - Debian アーカイブ信頼キーのキーリング - - - /usr/share/keyrings/debian-archive-removed-keys.gpg - - 削除された Debian アーカイブ信頼キーのキーリング - - - - - - - - - -関連項目 - -&apt-get;, &apt-secure; - - - - &manbugs; - &manauthor; - &translator; - - - diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml deleted file mode 100644 index 20c57fb16..000000000 --- a/doc/ja/apt-secure.ja.8.xml +++ /dev/null @@ -1,374 +0,0 @@ - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-secure - 8 - - - - - - - - - apt-secure - - APT アーカイブ認証サポート - - - - 説明 - - - バージョン 0.6 より、apt 全アーカイブに対する - Release ファイルの署名チェックコードが含まれています。 - Release ファイル署名キーにアクセスできない人が、 - アーカイブのパッケージの変更が確実にできないようにします。 - - - - - パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、 - アーカイブから来たパッケージは、信頼されていないと見なし、 - インストールの際に重要な警告が表示されます。 - apt-get は、 - 現在未署名のパッケージに対して警告するだけですが、 - 将来のリリースでは、全ソースに対し、 - パッケージダウンロード前に強制的に検証される可能性があります。 - - - - - &apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、 - この新認証機能をサポートしています。 - - - - - 信頼済アーカイブ - - - - apt アーカイブからエンドユーザまでの信頼の輪は、 - いくつかのステップで構成されています。 - apt-secure は、この輪の最後のステップで、 - アーカイブを信頼することは、 - パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、 - アーカイブメンテナを信頼すると言うことです。 - これは、アーカイブの完全性を保証するのは、 - アーカイブメンテナの責任だということです。 - - - - apt-secure はパッケージレベルの署名検証は行いません。 - そのようなツールが必要な場合は、 - debsig-verify や debsign - (debsig-verify パッケージと devscripts パッケージでそれぞれ提供されています) - を確認してください。 - - - - Debian における信頼の輪は、 - 新しいパッケージやパッケージの新しいバージョンを、 - メンテナが Debian アーカイブにアップロードすることで始まります。 - これは、Debian メンテナキーリング (debian-keyring パッケージにあります) - にあるメンテナのキーで署名しなければ、アップロードできないということです。 - メンテナのキーは、キーの所有者のアイデンティティを確保するため、 - 以下のような事前に確立した手段で、他のメンテナに署名されています。 - - - - - アップロードされたパッケージごとに、検証してアーカイブに格納します。 - パッケージは、メンテナの署名をはがされ、 MD5 sum を計算されて、 - Packages ファイルに格納されます。 - その後、全パッケージファイルの MD5 sum を計算してから、 - Release ファイルに置きます。 - Release ファイルは、アーカイブキーで署名されます。 - アーカイブキーは年ごとに作成され、FTP サーバで配布されます。 - このキーも Debian キーリングに含まれます。 - - - - - エンドユーザは誰でも、Release ファイルの署名をチェックし、 - パッケージの MD5 sum を抽出して、ダウンロードしたパッケージの MD5 sum - と比較できます。 - バージョン 0.6 以前では、ダウンロードした Debian パッケージの MD5 sum しか、 - チェックしていませんでした。 - 現在では、MD5 sum と Release ファイルの署名の両方でチェックします。 - - - - 以上は、パッケージごとの署名チェックとは違うことに注意してください。 - 以下のように考えられる 2 種類の攻撃を防ぐよう設計されています。 - - - - - ネットワーク中間者攻撃 - 署名をチェックしないと、 - 悪意あるエージェントがパッケージダウンロードプロセスに割り込んだり、 - ネットワーク構成要素 (ルータ、スイッチなど) の制御や、 - 悪漢サーバへのネットワークトラフィックのリダイレクトなど - (arp 経由や DNS スプーフィング攻撃) で、 - 悪意あるソフトウェアを掴まされたりします。 - - - ミラーネットワーク感染. - 署名をチェックしないと、悪意あるエージェントがミラーホストに感染し、 - このホストからダウンロードしたユーザすべてに、 - 悪意あるソフトウェアが伝播するようにファイルを変更できます。 - - - - しかしこれは、 - (パッケージに署名する) Debian マスターサーバ自体の感染や、 - Release ファイルに署名するのに使用したキーの感染を防げません。 - いずれにせよ、この機構はパッケージごとの署名を補完することができます。 - - - - ユーザの設定 - - - apt-key は、 - apt が使用するキーリストを管理するプログラムです。 - このリリースのインストールでは、Debian パッケージリポジトリで使用する、 - キーで署名するデフォルトの Debian アーカイブを提供しますが、 - apt-key でキーの追加・削除が行えます。 - - - - 新しいキーを追加するためには、まずキーをダウンロードする必要があります。 - (取得する際には、信頼できる通信チャネルを使用するよう、特に留意してください) - 取得したキーを、apt-key で追加し、 - apt-get update を実行してください。 - 以上により、apt は指定したアーカイブから、Release.gpg - ファイルをダウンロード・検証できるようになります。 - - - - -アーカイブの設定 - - - あなたがメンテナンスしているアーカイブで、アーカイブ署名を提供したい場合、 - 以下のようにしてください。 - - - - - 上位 Release ファイルの作成 - 既にこれが存在しているのでなければ、 - apt-ftparchive release (apt-utils で提供) - を実行して作成してください。 - - - 署名 - gpg -abs -o Release.gpg Release を実行して、 - 署名してください。 - - - キーの指紋を配布 - これにより、アーカイブ内のファイル認証に、 - どのキーをインポートする必要があるかを、 - ユーザに知らせることになります。 - - - - - アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、 - アーカイブメンテナは前述の最初の 1, 2 ステップに従わなければなりません。 - - - - -関連項目 - -&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, -&debsign; &debsig-verify;, &gpg; - - - -詳細な背景情報を検証するのなら、 -the Securing Debian Manual (harden-doc パッケージにもあります) の -Debian -Security Infrastructure 章と、 -V. Alex Brennen による -Strong Distribution HOWTO をご覧ください。 - - - - &manbugs; - &manauthor; - - -マニュアルページ筆者 - - -このマニュアルページは Javier Fernández-Sanguino -Peña, Isaac Jones, Colin Walters, Florian Weimer, Michael Vogt -の作業を元にしています。 - - - - - &translator; - - - diff --git a/doc/ja/apt-sortpkgs.ja.1.xml b/doc/ja/apt-sortpkgs.ja.1.xml deleted file mode 100644 index 779620f0b..000000000 --- a/doc/ja/apt-sortpkgs.ja.1.xml +++ /dev/null @@ -1,110 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt-sortpkgs - 1 - - - - - apt-sortpkgs - - パッケージインデックスファイルのソートユーティリティ - - - - - - - apt-sortpkgs - - - - file - - - - - 説明 - - apt-sortpkgs は、インデックスファイル - (ソースインデックスやパッケージインデックス) からレコードをソートし、 - パッケージ名順に整えます。 - また、内部のソート規則に従って、内部フィールドについてもソートを行います。 - - - - 出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。 - - - - オプション - &apt-cmdblurb; - - - - - - ソースインデックスフィールド順に並べ替え - 設定項目 - APT::SortPkgs::Source. - - - &apt-commonoptions; - - - - - - 関連項目 - &apt-conf; - - - - 診断メッセージ - apt-sortpkgs は正常終了時に 0 を返します。 - エラー時には十進の 100 を返します。 - - - &manbugs; - &translator; - - diff --git a/doc/ja/apt.conf.ja.5.xml b/doc/ja/apt.conf.ja.5.xml deleted file mode 100644 index 8707c801e..000000000 --- a/doc/ja/apt.conf.ja.5.xml +++ /dev/null @@ -1,809 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt.conf - 5 - - - - - apt.conf - - APT 設定ファイル - - - - 説明 - - apt.conf は、 - APT ツール集のメイン設定ファイルです。 - この設定ファイルと共通のコマンドラインパーサを使って、 - すべてのツールを統一環境で使用できます。 - APT ツールの起動時には、APT_CONFIG 環境変数に指定した設定を - (存在すれば) 読み込みます。 - 次に Dir::Etc::Parts のファイルを読み込みます。 - 次に Dir::Etc::main で指定した主設定ファイルを読み込み、 - 最後にコマンドラインオプションで、 - 設定ファイルより取得した値を上書きします。 - - - 設定ファイルは、 - 機能グループごとに系統立てられたオプションを木構造で表します。 - オプションの内容は、2 つのコロンで区切ります。 - 例えば APT::Get::Assume-Yes は、 - APT ツールグループの、Get ツール用オプションです。 - オプションは、親グループから継承しません。 - - - 設定言語の文法は、 - bind や dhcp のような ISC ツールをモデルにしています。 - // で始まる行はコメントとして扱われます (無視)。 - いずれの行も、APT::Get::Assume-Yes "true"; の - ような形式です。 - 行末のセミコロンは必要ですが、ダブルクォートは使わなくてもかまいません。 - 以下のように中カッコを使うと、新しいスコープを開くことができます。 - - -APT { - Get { - Assume-Yes "true"; - Fix-Broken "true"; - }; -}; - - - - また適宜改行することで、より読みやすくなります。 - リストは、開いたスコープ、クォートで囲まれた単語、 - そしてセミコロンと続けることで作成できます。 - セミコロンで区切ることで、複数のエントリを表すことができます。 - - -DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - - - - &docdir;examples/apt.conf &configureindex; - は一般的な設定ファイルのサンプルです。 - どのように設定するか参考になるでしょう。 - - - #include と #clear の - 2 つの特別な記法があります。 - #include は指定したファイルを取り込みます。 - ファイル名がスラッシュで終わった場合には、 - そのディレクトリをすべて取り込みます。 - #clear は名前のリストを削除するのに便利です。 - - - すべての APT ツールで、 - コマンドラインで任意の設定を行う -o オプションが使用できます。 - 文法は、完全なオプション名 (例: APT::Get::Assume-Yes)、 - 等号、続いてオプションの新しい値となります。 - リスト名に続き::を加えることで、リストを追加することができます。 - - - - APT グループ - - このオプショングループは、ツール全体に影響のある、 - 一般的な APT の振る舞いを制御します。 - - - Architecture - - システムアーキテクチャ - ファイルを取得したり、 - パッケージリストを解析するときに使用するアーキテクチャをセットします。 - 内部でのデフォルトは、 - apt をコンパイルしたアーキテクチャです。 - - - Ignore-Hold - - 保留パッケージの無視 - このグローバルオプションは、 - 問題解決器に保留と指定したパッケージを無視します。 - - - Clean-Installed - - デフォルトで有効です。autoclean 機能が on の時、 - ダウンロードできなくなったパッケージをキャッシュから削除します。 - off の場合、ローカルにインストールされているパッケージは、 - 削除対象から外します。 - しかし、 APT はキャッシュから削除したパッケージの再インストール方法を、 - 直接提供するわけではないことに注意してください。 - - - Immediate-Configure - - 即時設定無効 - この危険なオプションは、 - APT の要求コードを無効にして dpkg の呼び出しをほとんどしないようにします。 - これは、非常に遅いシングルユーザシステムでは必要かもしれませんが、 - 非常に危険で、パッケージのインストールスクリプトが失敗したり、 - もしくはもっと悪いことがおきるかもしれません。 - 自己責任で使用してください。 - - - Force-LoopBreak - - 何をしようとしているのか「本当に」判っているのでなければ、 - 絶対にこのオプションを有効にしないでください。 - 不可欠 (essential) パッケージ同士で、 - 競合 (Conflicts) /競合や競合/事前依存 (Pre-Depend) - のループに落ち込んだときに、 - 不可欠パッケージを一時的に削除してループを抜けられるようにします。 - そんなループはあり得ないはずで、 - あるとすれば重大なバグです。 - このオプションは、tar, gzip, libc, dpkg, bash とそれらが依存している - パッケージ以外の不可欠パッケージで動作します。 - - - Cache-Limit - - APT は「利用可能」情報を格納するために、 - 固定サイズのメモリマップキャッシュファイルを使用します。 - このオプションは、そのキャッシュサイズを指定します。 - - - Build-Essential - - 構築依存関係で不可欠なパッケージを定義します。 - - - Get - - サブセクション Get は &apt-get; ツールを制御します。 - このオプションの詳細は &apt-get; の文書を参照してください。 - - - Cache - - サブセクション Cache は &apt-cache; ツールを制御します。 - このオプションの詳細は &apt-cache; の文書を参照してください。 - - - CDROM - - サブセクション CDROM は &apt-cdrom; ツールを制御します。 - このオプションの詳細は &apt-cdrom; の文書を参照してください。 - - - - - - Acquire グループ - - Acquire オプショングループは、 - パッケージのダウンロードや URI ハンドラの制御を行います。 - - Queue-Mode - - キューモード - Queue-Mode は、 - APT がどのように並列接続を行うか、 - host か access で指定できます。 - host は、ターゲットホストごとに 1 接続を開きます。 - access は、 - URI タイプごとに 1 接続を開きます。 - - - Retries - - リトライの回数を設定します。 - 0 でない場合、APT は失敗したファイルに対して、 - 与えられた回数だけリトライを行います。 - - - Source-Symlinks - - ソースアーカイブのシンボリックリンクを使用します。 - true がセットされているとき、可能ならコピーの代わりにシンボリックリンクが - 張られます。true がデフォルトです。 - - - http - - HTTP URI - http::Proxy は、 - デフォルトで使用する http プロキシです。 - http://[[user][:pass]@]host[:port]/ - という標準形で表します。ホストごとのプロキシの場合は、 - http::Proxy::<host> という形と、 - プロキシを使用しないという意味の特殊キーワード DIRECT - を使用して指定することもできます。すべての設定は、 - 環境変数 http_proxy で上書きされます。 - - - HTTP/1.1 準拠のプロキシキャッシュの制御について、 - 3 種類の設定があります。No-Cache はプロキシに対して、 - いかなる時もキャッシュを使用しないと伝えます。 - Max-Age は、インデックスファイル用のときだけ送信し、 - 得られた時間よりも古かった場合に、 - オブジェクトをリフレッシュするようキャッシュに指示します。 - デフォルトでは 1 日となっているため、 - Debian は日毎にそのインデックスファイルを更新します。 - No-Store は、キャッシュがこのリクエストを格納せず、 - アーカイブファイルのみ設定するよう指定します。 - これは、非常に大きな .deb ファイルでプロキシキャッシュが汚れるのを、 - 防ぐのに便利かもしれません。 - 注) Squid 2.0.2 では、これらのオプションをサポートしていません。 - - - timeout オプションは、 - この方法でのタイムアウトまでの時間を設定します。 - これには、接続のタイムアウトとデータのタイムアウトが含まれています。 - - - リモートサーバが RFC 準拠でなかったり、 - (Squid 2.0.2 のように) バグがあったりしたときのために、 - パイプラインの深さの制御を設定します。 - Acquire::http::Pipeline-Depth により、 - APT が送信できるリクエストの回数を 0 から 5 の値で設定できます。 - リモートサーバが適切でなく、TCP 接続に時間がかかるときは、 - 必ず 0 の値を設定しなければなりません。 - そうでなければデータが破損してしまいます。 - これが必要なホストは RFC 2068 に違反しています。 - - - ftp - - FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。 - ftp://[[user][:pass]@]host[:port]/ という標準形で表しますが、 - 環境変数 ftp_proxy で上書きされます。 - ftp プロキシを使用するには、設定ファイルに ftp::ProxyLogin - スクリプトを設定する必要があります。 - プロキシサーバに送信する接続コマンドを、このエントリに設定します。 - どのようにするのかは &configureindex; の例を参照してください。 - その他にも、$(PROXY_USER) - $(PROXY_PASS) $(SITE_USER) - $(SITE_PASS) $(SITE) - $(SITE_PORT) が利用可能です。 - いずれも、それぞれ URI を構成するトークンです。 - - - timeout オプションは、 - この方法でのタイムアウトまでの時間を設定します。 - これには、接続のタイムアウトとデータのタイムアウトが含まれています。 - - - 設定のいくつかは、パッシブモードを制御するものです。 - 一般的に、パッシブモードのままにしておく方が安全で、 - ほぼどんな環境でも動作します。 - しかしある状況下では、パッシブモードが無効のため、 - 代わりにポートモード ftp を使用する必要があります。 - この設定は、プロキシを通る接続や特定のホストへの接続全般に有効です。 - (設定例はサンプル設定ファイルを参照してください) - - - 環境変数 ftp_proxy の http url により - FTP over HTTP のプロキシが利用可能になります。 - 文法は上の http についての説明を参照してください。 - 設定ファイルの中でこれをセットすることはできません。 - また、効率が悪いため FTP over HTTP を使用するのは推奨しません。 - - - ForceExtended の設定は RFC2428 の - EPSV コマンドと EPRT - コマンドの使用を制御します。デフォルトでは false です。 - これは、コントロールコネクションが IPv6 の時にのみ、 - このコマンドを使用するということです。 - これを true にセットすると、IPv4 コネクションでも強制的に、 - このコマンドを使用します。 - 注) ほとんどの FTP サーバは RFC2428 をサポートしていません。 - - - cdrom - - CDROM URI - マウントポイントの設定のみを行います。 - /etc/fstab で設定されているように、 - CDROM ドライブのマウントポイントを - cdrom::Mount に設定しなければなりません。 - (SMB マウントや古い mount パッケージなど) マウントポイントが fstab - に記述できない場合、かわりにマウント・アンマウントコマンドも使用できます。 - 文法は、cdrom ブロックを - "/cdrom/"::Mount "foo"; の形で記述します。 - スラッシュを後につけるのは重要です。 - アンマウントコマンドは UMount で指定することができます。 - - - gpgv - - GPGV URI - GPGV URI 用の唯一のオプションは、 - gpgv に渡す追加パラメータのオプションです。 - gpgv::Options gpgv に渡す追加オプション。 - - - - - - - - - ディレクトリ - - - Dir::State セクションは、 - ローカル状態情報に関するディレクトリを保持します。 - lists は、 - ダウンロードしたパッケージ一覧を格納するディレクトリで、 - status は dpkg の状態ファイルの名前を表します。 - preferences は APT の 設定ファイルの名前です。 - Dir::State には、 - / や ./ で始まらない - 全サブアイテムに付加する、デフォルトディレクトリを含んでいます。 - - - Dir::Cache は、 - ローカルキャッシュ情報に関する場所を格納しています。これは、 - ダウンロード済アーカイブの場所を示す Dir::Cache::archives - と同様に、srcpkgcache と pkgcache - のパッケージキャッシュの場所となります。 - それぞれを空にセットすることで、キャッシュの生成を無効にできます。 - おそらく、srcpkgcache よりも pkgcache を無効にすることが多いと思います。 - Dir::State と同様、Dir::Cache - はデフォルトディレクトリを含んでいます。 - - - Dir::Etc は設定ファイルの場所を格納しています。 - sourcelist はソースリストの場所を示し、 - main はデフォルトの設定ファイルです。 - (APT_CONFIG で設定ファイルを指定された場合のみ、 - この設定の効果があります) - - - Dir::Parts 設定は、指定されたディレクトリから、 - 字句単位の全ての設定断片を読みこみます。 - これを設定した後に、メイン設定ファイルをロードします。 - - - バイナリプログラムは Dir::Bin で指定します。 - Dir::Bin::Methods はメソッドハンドラの場所を指定し、 - gzip, dpkg, - apt-get, dpkg-source, - dpkg-buildpackage, apt-cache - はそれぞれプログラムの場所を指定します。 - - - - DSelect での APT - - - &dselect; 上で APT を使用する際、 - DSelect セクション以下の設定項目で、 - デフォルトの動作を制御します。 - - Clean - - キャッシュクリーンモード - - この値は always, prompt, auto, pre-auto, never のうちひとつを取ります。 - always と prompt は更新後、全パッケージをキャッシュから削除します。 - (デフォルトの) prompt では条件付きで削除します。 - auto はダウンロード不能パッケージ (例えば新バージョンで置き換えられたもの) - を削除します。pre-auto はこの動作を、 - 新パッケージをダウンロードする直前に行います。 - - - options - - この変数の内容は、 - install 時のコマンドラインオプションと同様に &apt-get; に渡されます。 - - - Updateoptions - - この変数の内容は、 - update 時のコマンドラインオプションと同様に &apt-get; に渡されます。 - - - PromptAfterUpdate - - true の場合、 - &dselect; の [U]pdate 実行時に、続行のためのプロンプトを毎回表示します。 - デフォルトはエラーが発生した場合のみです。 - - - - - - APT が dpkg を呼ぶ方法 - - 数種の設定項目で APT がどのように &dpkg; を呼び出すかを制御できます。 - DPkg セクションにあります。 - - - options - - dpkg に渡すオプションのリストです。 - オプションは、リスト記法を使用して指定しなければなりません。 - また、各リストは単一の引数として &dpkg; に渡されます。 - - - Pre-InvokePost-Invoke - - &dpkg; を呼び出す前後で実行するシェルコマンドのリストです。 - options のようにリスト記法で指定しなければなりません。 - コマンドは /bin/sh を使用して呼び出され、 - 何か問題があれば、APT は異常終了します。 - - - Pre-Install-Pkgs - - &dpkg; を呼び出す前に実行するシェルコマンドのリストです。 - options のようにリスト記法で指定しなければなりません。 - コマンドは /bin/sh を通して呼び出され、 - 何か問題があれば、APT は異常終了します。 - APT はインストールしようとする全 .deb ファイルのファイル名を、 - ひとつずつコマンドの標準入力に送ります。 - - - このプロトコルのバージョン 2 では、(プロトコルのバージョンや - APT 設定スペース、パッケージを含む) 詳細情報やファイル、 - 変更されているバージョンを出力します。 - DPkg::Tools::options::cmd::Version に 2 を設定すると、 - バージョン 2 を有効にできます。 - cmd は Pre-Install-Pkgs - で与えられるコマンドです。 - - - Run-Directory - - APT は dpkg を呼び出す前にこのディレクトリに移動します。 - デフォルトは / です。 - - - Build-options - - これらのオプションは、 - パッケージのコンパイル時に &dpkg-buildpackage; に渡されます。 - デフォルトでは、署名を無効にし、全バイナリを生成します。 - - - - - - デバッグオプション - - debug の多くのオプションは、 - 普通のユーザにとって興味を引くものではありません。 - しかし Debug::pkgProblemResolver で、 - dist-upgrade の判断についての興味深い出力が得られます。 - Debug::NoLockingは、 - APT が非 root で操作できるようにファイルのロックを無効にしますし、 - Debug::pkgDPkgPMは、 - dpkg を呼ぶ際のコマンドラインを出力します。 - Debug::IdentCdrom は、 - CDROM ID の状態データの包含を無効にします。 - Debug::Acquire::gpgv gpgv 法のデバッグです。 - - - - - 例 - - &configureindex; に、全利用可能オプションのデフォルト値を参照できる、 - 設定ファイルのサンプルがあります。 - - - - ファイル - /etc/apt/apt.conf - - - - 関連項目 - &apt-cache;, &apt-config;, &apt-preferences;. - - - &manbugs; - &translator; - - - diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja deleted file mode 100644 index 1d1c36b1e..000000000 --- a/doc/ja/apt.ent.ja +++ /dev/null @@ -1,328 +0,0 @@ - - - - -&docdir;examples/configure-index.gz"> -/etc/apt.conf"> - - - - - - apt.conf - 5 - " -> - - - apt-get - 8 - " -> - - - apt-config - 8 - " -> - - - apt-cdrom - 8 - " -> - - - apt-cache - 8 - " -> - - - apt_preferences - 5 - " -> - - - apt-key - 8 - " -> - - - apt-secure - 8 - " -> - - - apt-ftparchive - 1 - " -> - - - - sources.list - 5 - " -> - - - reportbug - 1 - " -> - - - dpkg - 8 - " -> - - - dpkg-buildpackage - 1 - " -> - - - gzip - 1 - " -> - - - dpkg-scanpackages - 8 - " -> - - - dpkg-scansources - 8 - " -> - - - dselect - 8 - " -> - - - aptitude - 8 - " -> - - - synaptic - 8 - " -> - - - debsign - 1 - " -> - - - debsig-verify - 1 - " -> - - - gpg - 1 - " -> - - - -
apt@packages.debian.org
- Jason Gunthorpe - 1998-2001 Jason Gunthorpe - 14 December 2003 - Linux - - -"> - - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - -"> - - - APT team - -"> - -Linux -"> - - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - -"> - - - APT team - -"> - - - Jason Gunthorpe - 1998-2001 - -"> - -Linux -"> - - -Bugs ---> - バグ - - APT バグページを - ご覧ください。 - APT のバグを報告する場合は、 - /usr/share/doc/debian/bug-reporting.txt や - &reportbug; コマンドをご覧ください。 - - -"> - - -Author ---> - 著者 - - APT は the APT team apt@packages.debian.org によって - 書かれました。 - - -"> - - -訳者 - 倉澤 望 nabetaro@debian.or.jp (2003-2006), - Debian JP Documentation ML debian-doc@debian.or.jp - - -"> - - - - - - 使い方の短い要約を表示します。 - - - - - - - - - プログラムのバージョンを表示します。 - - - - - - - - - 設定ファイル。 使用する設定ファイルを指定します。 - この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。 - 文法については &apt-conf; を参照してください。 - - - - - - - - - 設定オプションのセット。任意の設定オプションをセットします。 - 文法は となります。 - - - -"> - - -All command line options may be set using the configuration file, the - descriptions indicate the configuration option to set. For boolean - options you can override the config file by using something like - ,, - or several other variations. - ---> - この説明で示したオプションは、 - すべて設定ファイルを使用して設定できます。 - 設定ファイルに書いた真偽値をとるオプションは - ,, - などのようにして上書きできます。 - -"> - diff --git a/doc/ja/apt_preferences.ja.5.xml b/doc/ja/apt_preferences.ja.5.xml deleted file mode 100644 index a7e63a961..000000000 --- a/doc/ja/apt_preferences.ja.5.xml +++ /dev/null @@ -1,940 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - apt_preferences - 5 - - - - - apt_preferences - - APT 設定制御ファイル - - - - -説明 - -APT 設定ファイル /etc/apt/preferences は、 -インストールするパッケージのバージョン選択を制御するのに使用します。 - - -&sources-list; ファイルに複数のディストリビューション -(stable と testing など) -が指定されていて、 -パッケージに対し複数のバージョンがインストールできることがあります。 -このとき APT は、利用できるバージョンごとに優先度を割り当てます。 -依存関係規則を条件として、apt-get は、 -最も高い優先度を持つバージョンをインストールするよう選択します。 -APT 設定ファイルは、APT がデフォルトで割り当てた、 -パッケージのバージョンの優先度を上書きします。 -その結果、インストールするものの選択を、ユーザが選択できるようになります。 - - -&sources-list; ファイルに複数の参照が書かれている場合、 -パッケージの同じバージョンのインスタンスが複数利用できる可能性があります。 -この場合、apt-get は &sources-list; -ファイルの初めの方に指定されているところからダウンロードします。 -APT 設定ファイルは、バージョンの選択にのみ影響し、 -インスタンスの選択には影響しません。 - - -APT のデフォルト優先度の割り当て - - -設定ファイルがなかったり、 -設定ファイルに、特定のパッケージを割り当てるエントリがない場合、 -そのバージョンの優先度は、 -そのバージョンが属しているディストリビューションの優先度となります。 -デフォルトで他のディストリビューションより高い優先度を持つ、 -特定のディストリビューションを「ターゲットリリース」としておくのは可能です。 -ターゲットリリースは、apt-get のコマンドラインで設定したり、 -APT 設定ファイル /etc/apt/apt.conf で設定したりできます。 -例えば以下のようになります。 - - -apt-get install -t testing some-package - - -APT::Default-Release "stable"; - - - - -ターゲットリリースが指定されると、APT は以下のアルゴリズムで、 -パッケージのバージョンの優先度を設定します。このように割り当てます。 - - - - -優先度 100 - -(あるならば) 既にインストールされているバージョン。 - - - - -優先度 500 - -インストールされておらず、ターゲットリリースに含まれないバージョン。 - - - - -優先度 990 - -インストールされておらず、ターゲットリリースに含まれるバージョン。 - - - - - -ターゲットリリースが指定されていなければ、 -APT は単純にインストールしているパッケージのバージョンには 100 を、 -インストールしていないパッケージのバージョンには 500 を割り当てます。 - - -APT は、インストールするパッケージのバージョンを決定するために、 -以下のルールを上から順番に適用します。 - - -有効なバージョンの優先度が 1000 を越えない場合、 -決してダウングレードしません。 -(「ダウングレード」は、現在のパッケージのバージョンよりも、 -小さいバージョンのものをインストールします。 -APT のデフォルト優先度が 1000 を越えないことに注意してください。 -そのような優先度は設定ファイルでのみ設定できます。 -また、パッケージのダウングレードは危険であることにも注意してください) - -最も高い優先度のバージョンをインストールします。 - -同じ優先度のバージョンが複数存在する場合、 -最も新しいもの (最もバージョン番号が高いもの) をインストールします。 - -優先度・バージョン番号が同じものが複数存在し、 -そのパッケージのメタデータが異なるか --reinstall -オプションが与えられている場合、 -インストールされていないものをインストールします。 - - - - -よくある状況として、 -あるインストールされているパッケージのバージョン (優先度 100) が、 -&sources-list; ファイルのリストから得られるバージョン (優先度 500 か 990) -よりも新しくないということがあります。この場合、 -apt-get install some-package -や apt-get upgrade を実行するとパッケージが更新されます。 - - - -まれに、インストールされているパッケージのバージョンが、 -他の有効なバージョンよりも新しい場合があります。 -この時 -apt-get install some-package -や apt-get upgrade を実行しても、 -ダウングレードしません。 - - -時々、インストールしているパッケージのバージョンが、 -ターゲットリリースに属するバージョンよりも新しく、 -他のディストリビューションよりも古い場合があります。 -そのようなパッケージに対して -apt-get install some-package -や apt-get upgrade を実行すると、 -パッケージは更新されます。 -この場合、インストールされているバージョンよりも、 -少なくともひとつは、 -高い優先度を持つ有効なパッケージがあるからです。 - - - -APT 設定の効果 - - -APT 設定ファイルを使うと、 -システム管理者が優先度を割り当てられるようになります。 -ファイルは、空白行で区切られた、複数行からなるレコードで構成されています。 -レコードは特定形式か、汎用形式のどちらかの形式をとります。 - - - -特定形式は、優先度 ("Pin-Priority") を、 -指定したパッケージの指定したバージョン (範囲) について割り当てます。 -例えば以下のレコードは、 -"5.8" で始まる perl パッケージを、 -高い優先度に設定します。 - - -Package: perl -Pin: version 5.8* -Pin-Priority: 1001 - - - - -汎用形式は、与えられたディストリビューションにある、 -すべてのパッケージ (Release ファイルに列挙したパッケージ) -の優先度や、FQDNで指定した、 -特定のインターネットサイトから取得するパッケージの優先度を割り当てます。 - - -APT 設定ファイルに書かれている汎用形式のエントリは、 -パッケージのグループについてのみ適用されます。 -例えば以下のレコードは、ローカルサイトにある全パッケージについて、 -高い優先度を割り当てます。 - - -Package: * -Pin: origin "" -Pin-Priority: 999 - - - -注: ここで使用しているキーワードは "origin" です。 -Release ファイルに指定されたような、 -ディストリビューションの Origin と混同しないようにしてください。 -Release ファイルにある "Origin:" タグは、 -インターネットアドレスではなく、 -"Debian" や "Ximian" といった作者やベンダ名です。 - - -以下のレコードは、アーカイブ名が "unstable" -となっているディストリビューションに属するパッケージを、 -すべて低い優先度に割り当てます。 - - -Package: * -Pin: release a=unstable -Pin-Priority: 50 - - - -以下のレコードは、アーカイブ名が "stable" で、 -リリースバージョン番号が "3.0" -となっているリリースに属するパッケージを、 -すべて高い優先度に割り当てます。 - - -Package: * -Pin: release a=stable, v=3.0 -Pin-Priority: 500 - - - - - - - - - -APT が優先度に割り込む方法 - - - -APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。 -これは (おおざっぱにいうと) 以下のように解釈されます。 - - - -P > 1000 - -パッケージがダウングレードしても、このバージョンのパッケージをインストールします。 - - -990 < P <=1000 - -インストールされているバージョンの方が新しいことを除き、 -ターゲットリリースに含まれなくても、 -このバージョンのパッケージをインストールします。 - - -500 < P <=990 - -ターゲットリリースに属するバージョンがあったり、 -インストールされているバージョンの方が新しいのでなければ、 -このバージョンのパッケージをインストールします。 - - -100 < P <=500 - -他のディストリビューションに属するバージョンがあったり、 -インストールされているバージョンの方が新しいのでなければ、 -このバージョンのパッケージをインストールします。 - - -0 < P <=100 - -このパッケージがインストールされていない場合、 -このバージョンのパッケージをインストールします。 - - -P < 0 - -このバージョンがインストールされないようにします。 - - - - - -特定形式のレコードが利用可能パッケージバージョンに一致した場合、 -最初のレコードが、パッケージバージョンの優先度を決定します。 -失敗して、汎用形式のレコードが利用可能パッケージバージョンに一致した場合、 -最初のレコードが、パッケージバージョンの優先度を決定します。 - - -例えば、APT 設定ファイルの上の方に、 -以下のレコードが書かれていると仮定してください。 - - -Package: perl -Pin: version 5.8* -Pin-Priority: 1001 - -Package: * -Pin: origin "" -Pin-Priority: 999 - -Package: * -Pin: release unstable -Pin-Priority: 50 - - - -すると、 - - -バージョン番号が "5.8" で始まっていれば、 -perl の最新の利用可能パッケージがインストールされます。 -バージョン 5.8* が利用可能で、バージョン 5.9* がインストールされている場合、 -perl はダウングレードされます。 - -ローカルシステムで有効な、 -perl 以外のどんなパッケージでも、 -他のバージョンより (たとえターゲットリリースに属していても) 優先度が高くなります。 - - -ローカルシステムにはなくても &sources-list; -に列挙されたサイトにあるバージョンで、 -unstable ディストリビューションに属しているパッケージは、 -インストールするよう選択され、 -既にインストールされているバージョンがない場合にのみインストールされます。 - - - - - - - -パッケージのバージョンとディストリビューションプロパティの決定 - - -&sources-list; ファイルに列挙した場所では、 -その場所で利用できるパッケージを記述した、 -Packages ファイルや -Release ファイルを提供します。 - - -Packages ファイルは通常 -.../dists/dist-name/component/arch -ディレクトリにあります。 -例えば、.../dists/stable/main/binary-i386/Packages です。 -これは、ディレクトリにある利用可能パッケージごとに、 -複数行のレコードからできています。 -APT 優先度の設定は、レコードごとに以下の 2 行だけです。 - - - -Package: 行 -パッケージ名を与えます。 - - - -Version: 行 -その名前のパッケージのバージョン番号を与えます。 - - - - - -Release ファイルは、通常 -.../dists/dist-name -にあります。例えば、 -.../dists/stable/Release, -.../dists/woody/Release です。 -これは、このディレクトリ以下にある全パッケージに適用する、 -複数行のレコード 1 つから成っています。 -Packages と違い Release ファイルは、 -ほとんどの行が APT 優先度の設定に関連します。 - - - - -Archive: 行 - -このディレクトリツリーに属する全パッケージのアーカイブ名。 -例えば、 -"Archive: stable" -という行は、Release ファイルの親ディレクトリツリー以下にある全パッケージが、 -stable アーカイブだと指定します。 -APT 設定ファイルでこの値を指定するには、以下の行が必要になります。 - - -Pin: release a=stable - - - - - - -Version: 行 - -リリースバージョン名。 -例えば、このツリーのパッケージが、 -GNU/Linux リリースバージョン 3.0 に属するとします。 -通常 testing ディストリビューションや -unstable ディストリビューションには、 -まだリリースされていないので、バージョン番号が付きません。 -APT 設定ファイルでこれを指定するには、以下の行のいずれかが必要になります。 - - - -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 - - - - - - - -Component: 行 - -Release ファイルの、 -ディレクトリツリーにあるパッケージのライセンスコンポーネント名。 -例えば、"Component: main" という行は、このディレクトリ以下の全ファイルが、 -main コンポーネント -(Debian フリーソフトウェアガイドラインの元でライセンスされている) -であることを表します。 -APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必要になります。 - - -Pin: release c=main - - - - - - -Origin: 行 - -Release ファイルのディレクトリツリーにあるパッケージの提供者名。 -ほとんど共通で、Debian です。 -APT 設定ファイルでこの提供者を指定するには、以下の行が必要になります。 - - -Pin: release o=Debian - - - - - - -Label: 行 - -Release ファイルのディレクトリツリーにあるパッケージのラベル名。 -ほとんど共通で Debian です。 -APT 設定ファイルでこのラベルを指定するには、以下の行が必要になります。 - - -Pin: release l=Debian - - - - - - - -&sources-list; ファイルに列挙された場所から取得した -Packages ファイルや -Release ファイルはすべて、 -/var/lib/apt/lists ディレクトリや、 -apt.conf ファイルの -Dir::State::Lists 変数で指定した場所に取得されます。例えば、 -debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release ファイルは、 -debian.lcs.mit.edu から取得した、 -unstable ディストリビューションで、 -contrib コンポーネントな、 -binary-i386 アーキテクチャ用の -Release ファイルを含んでいます。 - - - - -APT 設定レコードのオプション行 - - -APT 設定ファイルのレコードごとに、 -任意で Explanation: で始まる行を持てます。 -これは、コメント用の場所を確保します。 - - -APT 設定レコードの Pin-Priority: 行は任意です。 -省略すると、Pin-Priority: release ... -で始まる行で指示した最後の値 (少なくとも1つ) を優先度に割り当てます。 - - - - - -サンプル - - -安定版を追跡 - - -以下の APT 設定ファイルは、stable -ディストリビューションに属する全てのパッケージのバージョンに、 -デフォルト (500) より高い優先度を割り当て、 -他の Debian -ディストリビューションのパッケージのバージョンには、 -低くてインストールできないような優先度を割り当てます。 - - -Explanation: Uninstall or do not install any Debian-originated -Explanation: package versions other than those in the stable distro -Package: * -Pin: release a=stable -Pin-Priority: 900 - -Package: * -Pin: release o=Debian -Pin-Priority: -10 - - - - -適切な &sources-list; ファイルと上記の設定ファイルにより、 -以下のコマンドで最新の stable -バージョンにアップグレードできます。 - - -apt-get install package-name -apt-get upgrade -apt-get dist-upgrade - - - - -以下のコマンドで、指定したパッケージを testing -ディストリビューションの最新バージョンにアップグレードします。 -このパッケージは、再度このコマンドを発行しないとアップグレードされません。 - - -apt-get install package/testing - - - - - - - テスト版や不安定版を追跡 - - -以下の APT 設定ファイルは、testing -ディストリビューションのパッケージのバージョンに高い優先度を割り当て、 -unstable -ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。 -また他の Debian -ディストリビューションのパッケージのバージョンには、 -低くてインストールできないような優先度を割り当てます。 - - -Package: * -Pin: release a=testing -Pin-Priority: 900 - -Package: * -Pin: release a=unstable -Pin-Priority: 800 - -Package: * -Pin: release o=Debian -Pin-Priority: -10 - - - - -適切な &sources-list; ファイルと上記の設定ファイルにより、 -以下のコマンドで最新の testing -バージョンにアップグレードできます。 - - -apt-get install package-name -apt-get upgrade -apt-get dist-upgrade - - - - -以下のコマンドで、指定したパッケージを unstable -ディストリビューションの最新バージョンにアップグレードします。 -それ以降、apt-get upgrade は -testing バージョンのパッケージが更新されていれば -testing の最新版に、 -unstable バージョンのパッケージが更新されていれば -unstableの最新版にアップグレードします。 - - -apt-get install package/unstable - - - - - - - - -関連項目 -&apt-get; &apt-cache; &apt-conf; &sources-list; - - - - &manbugs; - &translator; - - - diff --git a/doc/ja/makefile b/doc/ja/makefile index 286152995..da566cc96 100644 --- a/doc/ja/makefile +++ b/doc/ja/makefile @@ -14,29 +14,37 @@ STYLESHEET=./style.ja.xsl SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \ sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \ apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \ - apt-key.ja.8 apt-secure.ja.8 + apt-key.ja.8 apt-secure.ja.8 apt-mark.ja.8 -INCLUDES = apt.ent.ja +INCLUDES = apt.ent -doc: $(SOURCE) +doc: $(SOURCE) + +clean: clean-manpages + +clean-manpages: + rm -f $(SOURCE) \ + $(patsubst %.ja.1,%.1,$(SOURCE)) \ + $(patsubst %.ja.5,%.5,$(SOURCE)) \ + $(patsubst %.ja.8,%.8,$(SOURCE)) $(SOURCE) :: % : %.xml $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< -apt-cache.ja.8:: apt-cache.8 +apt-cache.ja.8:: apt-cache.8 cp $< $@ apt-get.ja.8:: apt-get.8 cp $< $@ -apt-cdrom.ja.8:: apt-cdrom.8 +apt-cdrom.ja.8:: apt-cdrom.8 cp $< $@ -apt.conf.ja.5:: apt.conf.5 +apt.conf.ja.5:: apt.conf.5 cp $< $@ -apt-config.ja.8:: apt-config.8 +apt-config.ja.8:: apt-config.8 cp $< $@ sources.list.ja.5:: sources.list.5 @@ -45,7 +53,7 @@ sources.list.ja.5:: sources.list.5 apt-sortpkgs.ja.1:: apt-sortpkgs.1 cp $< $@ -apt-ftparchive.ja.1:: apt-ftparchive.1 +apt-ftparchive.ja.1:: apt-ftparchive.1 cp $< $@ apt_preferences.ja.5:: apt_preferences.5 @@ -54,10 +62,14 @@ apt_preferences.ja.5:: apt_preferences.5 apt-extracttemplates.ja.1:: apt-extracttemplates.1 cp $< $@ -apt-key.ja.8:: apt-key.8 +apt-key.ja.8:: apt-key.8 cp $< $@ -apt-secure.ja.8:: apt-secure.8 +apt-secure.ja.8:: apt-secure.8 cp $< $@ +apt-mark.ja.8:: apt-mark.8 + cp $< $@ + + diff --git a/doc/ja/manpage.refs b/doc/ja/manpage.refs deleted file mode 100644 index 16ffc791b..000000000 --- a/doc/ja/manpage.refs +++ /dev/null @@ -1,4 +0,0 @@ -{ - '' => '', - '' => '' -} diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml deleted file mode 100644 index 8522a3be3..000000000 --- a/doc/ja/sources.list.ja.5.xml +++ /dev/null @@ -1,427 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - - sources.list - 5 - - - - - sources.list - - APT 用パッケージリソースリスト - - - - 説明 - - このパッケージリソースリストは、 - システムで使用するパッケージの保管場所を特定するのに使用されます。 - 今回このマニュアルページには、 - Debian GNU/Linux システムで使用するパッケージシステムについてのみ記述します。 - この制御ファイルは、/etc/apt/sources.list にあります。 - - - ソースリストは複数の有効な取得元と、 - 様々な取得メディアをサポートしています。 - ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。 - 行のフォーマットは、タイプ uri 引数 となります。 - 先頭の タイプ で、 - 引数 のフォーマットを決定します。 - uri は Universal Resource Identifier (URI) で、 - よく知られた URL のスーパーセットです。 - 行の残りに # を付けて、コメントにできます。 - - - sources.list.d - - /etc/apt/sources.list.d ディレクトリに - ファイル名が .list で終わる個別ファイルを置いておくと、 - sources.list エントリに追加できます。フォーマットは、 - 通常の sources.list ファイルと同じです。 - - - - deb タイプと deb-src タイプ - - deb タイプでは典型的な 2 段階の Debian アーカイブ - (distribution/component) を記述します。 - よくあるケースでは、distribution は通常 - stable unstable - testing のどれか、 - component は、main contrib - non-free non-us のどれかです。 - deb-src タイプでは、 - Debian ディストリビューションのソースコードを、 - deb タイプと同じ形式で記述します。 - deb-src 行は、 - ソースインデックスを取得するのに必要です。 - - - deb タイプと deb-src - タイプで使用する sources.list - エントリのフォーマットは、以下になります。 - - deb uri distribution [component1] [component2] [...] - - - deb タイプの URI は、 - APT が情報を見つけられるように、 - Debian ディストリビューションの基底を指定しなければなりません。 - distribution には正確なパスを指定できます。 - その場合 component を省略し、distribution - はスラッシュ (/) で終わらなくてはなりません。 - これは URL で指定されたアーカイブの、 - 特定のサブセクションのみに関心があるときに役に立ちます。 - distribution に正確なパスを指定しないのなら、 - 少なくともひとつは component を指定しなければなりません。 - - - distribution は、 - $(ARCH) 変数を含む場合があります。 - $(ARCH) 変数は、システムで使用している - Debian アーキテクチャ (i386, m68k, powerpc, ...) に展開されます。 - これにより、アーキテクチャに依存しない sources.list - ファイルを使用できます。 - 一般的に、これは正しいパスを指定するときに気にするだけです。 - そうでない場合は、APT は現在のアーキテクチャで URI - を自動的に生成します。 - - - 有効な全 distribution, component の場所から、 - 一部が必要な場合、1 行につき 1 distribution しか指定できないため、 - 同じ URI の行を複数記述することになるでしょう。 - APT は内部で URI リストを生成してから、並べ替えます。 - そして、同じインターネットホストに対しては複数の参照をまとめます。 - 例えば FTP 接続後、切断してからまた同じホストに再接続するといった、 - 効率の悪いことをせずに、1 接続にまとめます。 - この機能は、同時接続匿名ユーザ数を制限している、 - 混んでいる FTP サイトにアクセスするのに便利です。 - APT は、帯域の狭いサイトを効率よく扱うのに、 - 異なるホストへは、接続を並行して行うようにもしています。 - - - 最優先する取得元を最初に記述するというように、 - 優先順に取得元を記述するのは重要です。 - 一般的には、スピードの速い順に並べることになる - (例えば、CD-ROM に続いてローカルネットワークのホスト、 - さらに続いて彼方のインターネットホスト) でしょう。 - - - 例: - -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://http.us.debian.org/debian dists/stable-updates/ - - - - - - URI の仕様 - - - 現在認識する URI 対応は、cdrom, file, http, ftp です。 - - file - - - file スキームは、システム内の任意のディレクトリを、 - アーカイブとして扱えるようにします。 - これは NFS マウントやローカルミラーで便利です。 - - - cdrom - - - cdrom スキームは、APT がローカル CD-ROM ドライブを、 - メディア交換しながら使えるようにします。 - 取得元リストに cdrom エントリを追加するには、 - &apt-cdrom; プログラムを使用してください。 - - - http - - - http スキームはアーカイブとして、HTTP サーバを指定します。 - 環境変数 http_proxy が、 - http://server:port/ と言った形で指定されていれば、 - http_proxy で指定した プロキシサーバを使用します。 - ユーザ認証が必要な HTTP/1.1 プロキシの場合、 - http://user:pass@server:port/ と言う形で指定してください。 - この認証方法は安全ではないことに注意してください。 - - - ftp - - - ftp スキームは、アーカイブに FTP サーバを指定します。 - APT の FTP の振る舞いは、高度に設定できます。 - 詳細は、&apt-conf; のマニュアルページをご覧ください。 - ftp プロキシは、 - ftp_proxy 環境変数で指定することにご注意ください。 - この方法用に、さらにこの方法でしか使用しないのに、 - http プロキシを使用することができます - (http プロキシサーバは大抵 ftp urlも理解できます)。 - 設定ファイルで http を使用する際に、 - ftp プロキシを使用するよう設定してあっても無視されます。 - - - copy - - - copy スキームは、file スキームと同様ですが、パッケージをその場で使用せず、 - キャッシュディレクトリにコピーするところが違います。 - zip ディスクを使用していて、APT でコピーを行う場合に便利です。 - - - rshssh - - - rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、 - ファイルにアクセスするのに rsh/ssh を使用します。 - あらかじめ RSA キーや rhosts の配置が必要ですが、 - パスワードなし認証が可能です。 - リモートホストのファイルへのアクセスの際、 - ファイル転送に標準の find コマンドや - dd コマンドを使用します。 - - - - - - - サンプル - - /home/jason/debian に格納されている stable/main, stable/contrib, - stable/non-free 用のローカル (または NFS) アーカイブを使用します。 - deb file:/home/jason/debian stable main contrib non-free - - - 上記同様ですが、不安定版を使用します。 - deb file:/home/jason/debian unstable main contrib non-free - - - 上記のソース行 - deb-src file:/home/jason/debian unstable main contrib non-free - - - archive.debian.org のアーカイブに HTTP アクセスし、 - hamm/main のみを使用します。 - deb http://archive.debian.org/debian-archive hamm main - - - ftp.debian.org のアーカイブに FTP アクセスし、 - debian ディレクトリ以下の stable/contrib のみを使用します。 - deb ftp://ftp.debian.org/debian stable contrib - - - ftp.debian.org のアーカイブに FTP アクセスし、 - debian ディレクトリ以下の unstable/contrib を使用します。 - sources.list に上記サンプルと一緒に指定された場合、 - 両方のリソース行に対応する FTP セッションはひとつだけになります。 - deb ftp://ftp.debian.org/debian unstable contrib - - - nonus.debian.org のアーカイブに HTTP アクセスし、 - debian-non-US ディレクトリ以下を使用します。 - deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free - - - nonus.debian.org のアーカイブに HTTP アクセスし、 - debian-non-US ディレクトリ以下を使用します。 - また、i386 マシンでは unstable/binary-i386 - 以下にあるファイル、 - m68k マシンでは unstable/binary-m68k - 以下にあるファイル、 - その他サポートするアーキテクチャごとのファイルのみ使用します。 - [このサンプルは変数展開の使用法の説明でしかないことに注意してください。 - non-us はこのような構造になっていません] - deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/ - - - - - 関連項目 - &apt-cache; &apt-conf; - - - - &manbugs; - &translator; - - - diff --git a/doc/po/ja.po b/doc/po/ja.po new file mode 100644 index 000000000..f6ab7a3e5 --- /dev/null +++ b/doc/po/ja.po @@ -0,0 +1,9649 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2009-07-30 22:55+0900\n" +"PO-Revision-Date: 2009-07-30 22:55+0900\n" +"Last-Translator: KURASAWA Nozomu \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +# type: TH +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "apt" +msgstr "apt" + +# type: TH +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "16 June 1998" +msgstr "16 June 1998" + +# type: TH +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "Debian GNU/Linux" +msgstr "Debian GNU/Linux" + +# type: SH +#. type: SH +#: apt.8:18 +#, no-wrap +msgid "NAME" +msgstr "名称" + +# type: Plain text +#. type: Plain text +#: apt.8:20 +msgid "apt - Advanced Package Tool" +msgstr "apt - 高度パッケージツール" + +# type: SH +#. type: SH +#: apt.8:20 +#, no-wrap +msgid "SYNOPSIS" +msgstr "書式" + +# type: Plain text +#. type: Plain text +#: apt.8:22 +msgid "B" +msgstr "B" + +# type: SH +#. type: SH +#: apt.8:22 +#, no-wrap +msgid "DESCRIPTION" +msgstr "説明" + +# type: Plain text +#. type: Plain text +#: apt.8:31 +msgid "" +"APT is a management system for software packages. For normal day to day " +"package management there are several frontends available, such as B" +"(8) for the command line or B(8) for the X Window System. Some " +"options are only implemented in B(8) though." +msgstr "" +"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理には、コ" +"マンドライン用には B(8)、X Window System 用には B(8) と" +"いった、いくつかのフロントエンドが用意されています。しかし、いくつかのオプ" +"ションは B(8) にしか実装されていません。" + +# type: SH +#. type: SH +#: apt.8:31 +#, no-wrap +msgid "OPTIONS" +msgstr "オプション" + +# type: Plain text +#. type: Plain text +#: apt.8:33 apt.8:35 +msgid "None." +msgstr "なし。" + +# type: SH +#. type: SH +#: apt.8:33 +#, no-wrap +msgid "FILES" +msgstr "ファイル" + +# type: SH +#. type: SH +#: apt.8:35 +#, no-wrap +msgid "SEE ALSO" +msgstr "関連項目" + +# type: Plain text +#. type: Plain text +#: apt.8:42 +msgid "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" +msgstr "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" + +# type: SH +#. type: SH +#: apt.8:42 +#, no-wrap +msgid "DIAGNOSTICS" +msgstr "診断メッセージ" + +# type: Content of: +#. type: Plain text +#: apt.8:44 +msgid "apt returns zero on normal operation, decimal 100 on error." +msgstr "apt は正常終了時に 0 を返します。エラー時には十進の 100 を返します。" + +# type: SH +#. type: SH +#: apt.8:44 +#, no-wrap +msgid "BUGS" +msgstr "バグ" + +# type: Plain text +#. type: Plain text +#: apt.8:46 +msgid "This manpage isn't even started." +msgstr "このマニュアルページは、始まってさえいません。" + +# type: Plain text +#. type: Plain text +#: apt.8:55 +msgid "" +"See Ehttp://bugs.debian.org/aptE. If you wish to report a bug in " +"B, please see I or the " +"B(1) command." +msgstr "" +"Ehttp://bugs.debian.org/aptE をご覧ください。B のバグを報告する" +"場合は、I や B(1) コマン" +"ドをご覧ください。" + +# type: SH +#. type: SH +#: apt.8:55 +#, no-wrap +msgid "AUTHOR" +msgstr "著者" + +# type: Plain text +#. type: Plain text +#: apt.8:56 +msgid "apt was written by the APT team Eapt@packages.debian.orgE." +msgstr "" +"apt は the APT team Eapt@packages.debian.orgE によって書かれました。" + +#. type: Plain text +#: apt.ent:2 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:10 +msgid "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " +msgstr "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " + +#. type: Plain text +#: apt.ent:17 +#, no-wrap +msgid "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:23 +#, no-wrap +msgid "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:29 +#, no-wrap +msgid "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:35 +#, no-wrap +msgid "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:41 +#, no-wrap +msgid "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:47 +#, no-wrap +msgid "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:53 +#, no-wrap +msgid "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:59 +#, no-wrap +msgid "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:65 +#, no-wrap +msgid "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:72 +#, no-wrap +msgid "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:78 +#, no-wrap +msgid "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:84 +#, no-wrap +msgid "" +"\n" +" dpkg\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:90 +#, no-wrap +msgid "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:96 +#, no-wrap +msgid "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:102 +#, no-wrap +msgid "" +"\n" +" dpkg-scanpackages\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scanpackages\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:108 +#, no-wrap +msgid "" +"\n" +" dpkg-scansources\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scansources\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:114 +#, no-wrap +msgid "" +"\n" +" dselect\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dselect\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:120 +#, no-wrap +msgid "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:126 +#, no-wrap +msgid "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:132 +#, no-wrap +msgid "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:138 +#, no-wrap +msgid "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:144 +#, no-wrap +msgid "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:150 +#, no-wrap +msgid "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:156 +#, no-wrap +msgid "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:165 +#, no-wrap +msgid "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" Jason Gunthorpe\n" +" 1998-2001 Jason Gunthorpe\n" +" 28 October 2008\n" +" Linux\n" +msgstr "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" Jason Gunthorpe\n" +" 1998-2001 Jason Gunthorpe\n" +" 28 October 2008\n" +" Linux\n" + +#. type: Plain text +#: apt.ent:168 +#, no-wrap +msgid "" +" \n" +"\"> \n" +msgstr "" +" \n" +"\"> \n" + +#. type: Plain text +#: apt.ent:174 apt.ent:204 +#, no-wrap +msgid "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" +msgstr "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:181 apt.ent:211 +#, no-wrap +msgid "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:188 +#, no-wrap +msgid "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:194 apt.ent:217 +#, no-wrap +msgid "" +"\n" +" APT team\n" +" \n" +"\">\n" +msgstr "" +"\n" +" APT team\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:198 apt.ent:228 +#, no-wrap +msgid "" +"Linux\n" +"\">\n" +msgstr "" +"Linux\n" +"\">\n" + +#. type: Plain text +#: apt.ent:224 +#, no-wrap +msgid "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:234 +#, no-wrap +msgid "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" +msgstr "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" + +#. type: Plain text +#: apt.ent:245 +#, no-wrap +msgid "" +"\n" +"Bugs\n" +" APT bug page. \n" +" If you wish to report a bug in APT, please see\n" +" /usr/share/doc/debian/bug-reporting.txt or the\n" +" &reportbug; command.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"バグ\n" +" APT バグページ をご覧ください。 \n" +" APT のバグを報告する場合は、\n" +" /usr/share/doc/debian/bug-reporting.txt や\n" +" &reportbug; コマンドをご覧ください。\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:253 +#, no-wrap +msgid "" +"\n" +"Author\n" +" APT was written by the APT team apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"著者\n" +" APT は APT team apt@packages.debian.org によって書かれました。\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:263 +#, no-wrap +msgid "" +"\n" +"\n" +" \n" +" Show a short usage summary.\n" +" \n" +" \n" +" \n" +msgstr "" +"\n" +"\n" +" \n" +" 使い方の短い要約を表示します。\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:271 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Show the program version.\n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" プログラムのバージョンを表示します。\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:281 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Configuration File; Specify a configuration file to use. \n" +" The program will read the default configuration file and then this \n" +" configuration file. See &apt-conf; for syntax information. \n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" 設定ファイル。 使用する設定ファイルを指定します。\n" +" この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。\n" +" 文法については &apt-conf; を参照してください。\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:293 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Set a Configuration Option; This will set an arbitrary\n" +" configuration option. The syntax is .\n" +" and can be used multiple\n" +" times to set different options.\n" +" \n" +" \n" +" \n" +"\">\n" +msgstr "" +" \n" +" \n" +" \n" +" 設定オプションのセット。任意の設定オプションをセットします。\n" +" 文法は となります。\n" +" 異なるオプションを設定するため、 と は、\n" +" 複数回使用できます。 \n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:304 +#, no-wrap +msgid "" +"\n" +"All command line options may be set using the configuration file, the\n" +" descriptions indicate the configuration option to set. For boolean\n" +" options you can override the config file by using something like \n" +" ,, \n" +" or several other variations.\n" +" \n" +"\">\n" +msgstr "" +"\n" +"ここで設定オプションとして説明したコマンドラインオプションは、\n" +" すべて設定ファイルを使用して設定できます。\n" +" 設定ファイルに書いた真偽値をとるオプションは\n" +" ,, \n" +" などのようにして上書きできます。\n" +" \n" +"\">\n" + +#. The last update date +#. type: Content of: +#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 +#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" + +# type: Content of: +#. type: Content of: +#: apt-cache.8.xml:22 apt-cache.8.xml:28 +msgid "apt-cache" +msgstr "apt-cache" + +#. type: Content of: +#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 +#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 +msgid "8" +msgstr "8" + +# type: Content of: +#. type: Content of: +#: apt-cache.8.xml:29 +msgid "APT package handling utility -- cache manipulator" +msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作ツール" + +# type: Content of: +#. type: Content of: +#: apt-cache.8.xml:35 +msgid "" +"apt-cache " +"add file gencaches showpkg pkg " +"showsrc pkg stats dump dumpavail unmet search regex show pkg depends pkg " +"rdepends pkg pkgnames prefix dotty pkg " +"xvcg pkg policy pkgs madison pkgs " +msgstr "" +"apt-cache " +"add file gencaches showpkg pkg " +"showsrc pkg stats dump dumpavail unmet search regex show pkg depends pkg " +"rdepends pkg pkgnames prefix dotty pkg " +"xvcg pkg policy pkgs madison pkgs " + +# type: Content of: +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:61 apt-cdrom.8.xml:46 apt-config.8.xml:46 +#: apt-extracttemplates.1.xml:42 apt-ftparchive.1.xml:54 apt-get.8.xml:114 +#: apt-key.8.xml:33 apt-mark.8.xml:43 apt-secure.8.xml:39 +#: apt-sortpkgs.1.xml:43 apt.conf.5.xml:38 apt_preferences.5.xml:32 +#: sources.list.5.xml:32 +msgid "Description" +msgstr "説明" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:62 +msgid "" +"<command>apt-cache</command> performs a variety of operations on APT's " +"package cache. <command>apt-cache</command> does not manipulate the state of " +"the system but does provide operations to search and generate interesting " +"output from the package metadata." +msgstr "" +"<command>apt-cache</command> は APT のパッケージキャッシュに対して、さまざま" +"な操作を行います。<command>apt-cache</command> は、システム状態の操作は行いま" +"せんが、パッケージのメタデータより検索したり、興味深い出力を生成するといった" +"操作を提供します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:67 apt-get.8.xml:120 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given, " +"one of the commands below must be present." +msgstr "" +"<option>-h</option> オプションや <option>--help</option> オプションを除き、以" +"下に挙げるコマンドが必要です。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:71 +msgid "add <replaceable>file(s)</replaceable>" +msgstr "add <replaceable>file(s)</replaceable>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:72 +msgid "" +"<literal>add</literal> adds the named package index files to the package " +"cache. This is for debugging only." +msgstr "" +"<literal>add</literal> は、パッケージキャッシュに指定したパッケージインデック" +"スファイルを追加します。デバッグ専用です。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:76 +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:77 +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><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:83 +msgid "showpkg <replaceable>pkg(s)</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:84 +msgid "" +"<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 well " +"as forward dependencies for each version. Forward (normal) dependencies are " +"those packages upon which the package in question depends; reverse " +"dependencies are those packages that depend upon the package in question. " +"Thus, forward dependencies must be satisfied for a package, but reverse " +"dependencies need not be. For instance, <command>apt-cache showpkg " +"libreadline2</command> would produce output similar to the following:" +msgstr "" +"<literal>showpkg</literal> は、コマンドライン上に列挙したパッケージの情報を表" +"示します。後に続く引数はパッケージ名となります。各パッケージについて、有効な" +"バージョンと被依存関係を列挙し、さらにその各バージョンについて依存関係を表示" +"します。(通常の) 依存関係とは、対象のパッケージが依存しているパッケージを指し" +"ます。また、被依存関係とは、対象のパッケージに依存しているパッケージを指しま" +"す。従って、パッケージの依存関係は満たさなければなりませんが、被依存関係は満" +"たす必要はありません。実例として、以下に <command>apt-cache showpkg " +"libreadline2</command> の出力を掲げます。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-cache.8.xml:96 +#, no-wrap +msgid "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +msgstr "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:108 +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, " +"libreadlineg2 and libreadline2-altdev depend on libreadline2. If " +"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be " +"installed; libreadlineg2 and libreadline2-altdev do not have to be " +"installed. For the specific meaning of the remainder of the output it is " +"best to consult the apt source code." +msgstr "" +"つまり、libreadline2 の version 2.1-12 は、libc5 と ncurses3.0 に依存してい" +"て、libreadline2 が動作するには、これらをインストールする必要があるということ" +"が判ります。一方、libreadlineg2 と libreadline2-altdev は libreadline2 に依存" +"しています。libreadline2 をインストールするためには、libc5, ncurses3.0, ldso " +"をすべてインストールしなければなりませんが、libreadlineg2 と libreadline2-" +"altdev はインストールする必要はありません。出力の残りの部分の意味については、" +"apt のソースコードを調べるのが最良でしょう。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:117 +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:117 +msgid "" +"<literal>stats</literal> displays some statistics about the cache. No " +"further arguments are expected. Statistics reported are:" +msgstr "" +"<literal>stats</literal> はキャッシュについての統計情報を表示します。それ以" +"上、引数は必要ありません。以下の統計情報を表示します。" + +# 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:120 +msgid "" +"<literal>Total package names</literal> is the number of package names found " +"in the cache." +msgstr "" +"<literal>パッケージ名総数</literal>は、キャッシュに存在するパッケージ数を表し" +"ます。" + +# 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:124 +msgid "" +"<literal>Normal packages</literal> is the number of regular, ordinary " +"package names; these are packages that bear a one-to-one correspondence " +"between their names and the names used by other packages for them in " +"dependencies. The majority of packages fall into this category." +msgstr "" +"<literal>通常パッケージ</literal>は、公式の普通のパッケージ数を表します。これ" +"は、他のパッケージの依存関係で使用された名称で、それが一対一に対応するパッ" +"ケージです。大多数のパッケージはこのカテゴリに入ります。" + +# 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 +msgid "" +"<literal>Pure virtual packages</literal> is the number of packages that " +"exist only as a virtual package name; that is, packages only \"provide\" the " +"virtual package name, and no package actually uses the name. For instance, " +"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " +"package; several packages provide \"mail-transport-agent\", but there is no " +"package named \"mail-transport-agent\"." +msgstr "" +"<literal>純粋仮想パッケージ</literal>は、仮想パッケージ名としてのみ存在する" +"パッケージ (仮想パッケージ名のみを「提供」し、実際にはいかなるパッケージもそ" +"の名称を持たない) の数を表します。例えば、Debian GNU/Linux システムでは " +"\"mail-transport-agent\" は純粋仮想パッケージです。\"mail-transport-agent\" " +"を提供するパッケージはいくつもありますが、\"mail-transport-agent\" という名称" +"のパッケージはありません。" + +# 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:138 +msgid "" +"<literal>Single virtual packages</literal> is the number of packages with " +"only one package providing a particular virtual package. For example, in the " +"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " +"one package, xless, provides \"X11-text-viewer\"." +msgstr "" +"<literal>単一仮想パッケージ</literal>は、特定の仮想パッケージ名を提供するパッ" +"ケージが、ただ一つの場合の数を表します。例えば、Debian GNU/Linux システムで" +"は、\"X11-text-viewer\" は仮想パッケージですが、\"X11-text-viewer\" を提供す" +"るパッケージは、xless パッケージのみということです。" + +# 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:144 +msgid "" +"<literal>Mixed virtual packages</literal> is the number of packages that " +"either provide a particular virtual package or have the virtual package name " +"as the package name. For instance, in the Debian GNU/Linux system, \"debconf" +"\" is both an actual package, and provided by the debconf-tiny package." +msgstr "" +"<literal>複合仮想パッケージ</literal>は、その仮想パッケージ名を提供するパッ" +"ケージが複数あるか、またパッケージ名と同じ仮想パッケージ名を持つパッケージ数" +"を表します。例えば、Debian GNU/Linux システムでは、debconf は実際のパッケージ" +"名でもありますが、debconf-tiny によって提供もされています。" + +# 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:151 +msgid "" +"<literal>Missing</literal> is the number of package names that were " +"referenced in a dependency but were not provided by any package. Missing " +"packages may be in evidence if a full distribution is not accessed, or if a " +"package (real or virtual) has been dropped from the distribution. Usually " +"they are referenced from Conflicts or Breaks statements." +msgstr "" +"<literal>欠落</literal>は、依存関係中には存在するのに、どのパッケージにも提供" +"されていないパッケージ名の数を表します。このパッケージがあるということは、全" +"ディストリビューションにアクセスできていないか、(実ないし仮想) パッケージが" +"ディストリビューションからはずされてしまった可能性もあります。通常では、構文" +"が矛盾するとこのようになります。" + +# 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:158 +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 " +"total package names. If more than one distribution (both \"stable\" and " +"\"unstable\", for instance), is being accessed, this value can be " +"considerably larger than the number of total package names." +msgstr "" +"<literal>個別バージョン総数</literal>は、キャッシュに存在するパッケージのバー" +"ジョンの数を表します。そのため、この値は最小でもパッケージ名総数と一致しま" +"す。もし複数のディストリビューション (例 \"stable\" と \"unstable\" の両方) " +"を利用した場合、この値はパッケージ名総数よりもかなり大きい数になります。" + +# 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:165 +msgid "" +"<literal>Total dependencies</literal> is the number of dependency " +"relationships claimed by all of the packages in the cache." +msgstr "" +"<literal>依存関係総数</literal>は、キャッシュにあるすべてのパッケージで要求さ" +"れた依存関係の数です。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:172 +msgid "showsrc <replaceable>pkg(s)</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:173 +msgid "" +"<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." +msgstr "" +"<literal>showsrc</literal> は、指定したパッケージ名に一致するソースパッケージ" +"を、すべて表示します。バイナリになるときの名称を宣言したレコードと同様に、す" +"べてのバージョンについて表示します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:178 apt-config.8.xml:83 +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:179 +msgid "" +"<literal>dump</literal> shows a short listing of every package in the cache. " +"It is primarily for debugging." +msgstr "" +"<literal>dump</literal> は、キャッシュ内のパッケージそれぞれについて、短い一" +"覧を表示します。主にデバッグ用です。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:183 +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:184 +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 "" +"<literal>dumpavail</literal> は、標準出力に利用可能なものの一覧を出力しま" +"す。 &dpkg; と共に使用すると便利ですし、&dselect; でも使用されます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:188 +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:189 +msgid "" +"<literal>unmet</literal> displays a summary of all unmet dependencies in the " +"package cache." +msgstr "" +"<literal>unmet</literal> は、パッケージキャッシュ内にある、不適当な依存関係の" +"概要を表示します。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:193 +msgid "show <replaceable>pkg(s)</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:194 +msgid "" +"<literal>show</literal> performs a function similar to <command>dpkg --print-" +"avail</command>; it displays the package records for the named packages." +msgstr "" +"<literal>show</literal> は、<command>dpkg --print-avail</command> と同様の機" +"能を実行します。これは、指定したパッケージのパッケージレコードの表示です。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:199 +msgid "search <replaceable>regex [ 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:200 +msgid "" +"<literal>search</literal> performs a full text search on all available " +"package lists for the POSIX regex pattern given, see " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " +"the descriptions for an occurrence of the regular expression and prints out " +"the package name and the short description, including virtual package " +"names. If <option>--full</option> is given then output identical to " +"<literal>show</literal> is produced for each matched package, and if " +"<option>--names-only</option> is given then the long description is not " +"searched, only the package name is." +msgstr "" +"<literal>search</literal> は、与えられた POSIX の正規表現 " +"(<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry> 参照) により、すべての利用可能なパッ" +"ケージに対して全文検索を行います。パッケージ名と説明に対して正規表現で検索を" +"行い、パッケージ名 (仮想パッケージ名を含む) と短い説明文を表示します。" +"<option>--full</option> が与えられた場合、マッチしたパッケージに対し " +"<literal>show</literal> と同じ情報を出力します。<option>--names-only</" +"option> が与えられた場合は、説明文に対して検索を行わず、パッケージ名に対して" +"のみ対象とします。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:213 +msgid "" +"Separate arguments can be used to specify multiple search patterns that are " +"and'ed together." +msgstr "空白で区切った引数で、複数の検索パターンの and をとることができます。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:217 +msgid "depends <replaceable>pkg(s)</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:218 +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 "" +"<literal>depends</literal> は、パッケージが持っている依存関係と、その依存関係" +"を満たす他のパッケージの一覧を表示します。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:222 +msgid "rdepends <replaceable>pkg(s)</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:223 +msgid "" +"<literal>rdepends</literal> shows a listing of each reverse dependency a " +"package has." +msgstr "" +"<literal>rdepends</literal> は、パッケージが持つ被依存関係を一覧表示します。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:227 +msgid "pkgnames <replaceable>[ 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:228 +msgid "" +"This command prints the name of each package in the system. The optional " +"argument is a prefix match to filter the name list. The output is suitable " +"for use in a shell tab complete function and the output is generated " +"extremely quickly. This command is best used with the <option>--generate</" +"option> option." +msgstr "" +"このコマンドは、システムでの各パッケージの名称を表示します。オプションの引数" +"により、取得する一覧より先頭一致で抽出することができます。この出力はシェルの" +"タブによる補完機能に使いやすく、また非常に速く生成されます。このコマンドは " +"<option>--generate</option> オプションと共に使用すると非常に便利です。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:235 +msgid "dotty <replaceable>pkg(s)</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:236 +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." +"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result " +"will be a set of nodes and edges representing the relationships between the " +"packages. By default the given packages will trace out all dependent " +"packages; this can produce a very large graph. To limit the output to only " +"the packages listed on the command line, set the <literal>APT::Cache::" +"GivenOnly</literal> option." +msgstr "" +"<literal>dotty</literal> は、コマンドライン上のパッケージ名から、<ulink url=" +"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink> パッケー" +"ジの dotty コマンドで利用するのに便利な出力を生成します。結果はパッケージの関" +"係を表わす、ノード・エッジのセットで表現されます。デフォルトでは、すべての依" +"存パッケージをトレースするので、非常に大きい図が得られます。これは、" +"<literal>APT::Cache::GivenOnly</literal> オプションを設定して解除できます。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:245 +msgid "" +"The resulting nodes will have several shapes; normal packages are boxes, " +"pure provides are triangles, mixed provides are diamonds, missing packages " +"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " +"lines are pre-depends, green lines are conflicts." +msgstr "" +"結果のノードは数種の形状をとります。通常パッケージは四角、純粋仮想パッケージ" +"は三角、複合仮想パッケージは菱形、六角形は欠落パッケージをそれぞれ表します。" +"オレンジの四角は再帰が終了した「リーフパッケージ」、青い線は先行依存、緑の線" +"は競合を表します。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:250 +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:253 +msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgstr "xvcg <replaceable>pkg(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:254 +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 "" +"<literal>dotty</literal> と同様ですが、<ulink url=\"http://rw4.cs.uni-sb.de/" +"users/sander/html/gsvcg1.html\">VCG tool</ulink> の xvcg 専用です。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:258 +msgid "policy <replaceable>[ pkg(s) ]</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:259 +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 " +"source. Otherwise it prints out detailed information about the priority " +"selection of the named package." +msgstr "" +"<literal>policy</literal> は、設定ファイル関係の問題について、デバッグを支援" +"します。引数を指定しなかった場合、取得元ごとの優先順位を表示します。一方、" +"パッケージ名を指定した場合、優先順の詳細情報を表示します。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:265 +msgid "madison <replaceable>/[ pkg(s) ]</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:266 +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 " +"archive management tool, <literal>madison</literal>. It displays available " +"versions of a package in a tabular format. Unlike the original " +"<literal>madison</literal>, it can only display information for the " +"architecture for which APT has retrieved package lists (<literal>APT::" +"Architecture</literal>)." +msgstr "" +"<literal>apt-cache</literal> の <literal>madison</literal> コマンドは、" +"Debian アーカイブ管理ツール <literal>madison</literal> の機能のサブセットで、" +"出力フォーマットを真似ようとします。パッケージの利用可能バージョンを表形式で" +"表示します。オリジナルの <literal>madison</literal> と違い、APT がパッケージ" +"一覧を検索したアーキテクチャ (<literal>APT::Architecture</literal>) の情報を" +"表示するだけです。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:277 apt-config.8.xml:92 apt-extracttemplates.1.xml:55 +#: apt-ftparchive.1.xml:491 apt-get.8.xml:299 apt-mark.8.xml:73 +#: apt-sortpkgs.1.xml:53 apt.conf.5.xml:373 apt.conf.5.xml:395 +msgid "options" +msgstr "オプション" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 +msgid "<option>-p</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 +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:282 +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::" +"pkgcache</literal>." +msgstr "" +"パッケージキャッシュを格納するファイルを選択します。パッケージキャッシュは、" +"すべての操作で使用される一次キャッシュです。設定項目 - <literal>Dir::Cache::" +"pkgcache</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:287 apt-ftparchive.1.xml:534 apt-get.8.xml:356 +#: apt-sortpkgs.1.xml:57 +msgid "<option>-s</option>" +msgstr "<option>-s</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:287 +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:288 +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 " +"information from remote sources. When building the package cache the source " +"cache is used to avoid reparsing all of the package files. Configuration " +"Item: <literal>Dir::Cache::srcpkgcache</literal>." +msgstr "" +"ソースキャッシュを格納するファイルを選択します。このソースキャッシュは " +"<literal>gencaches</literal> でのみ使用され、ここに解析された取得元のパッケー" +"ジ情報が格納されています。パッケージキャッシュを構築する際に、ソースキャッ" +"シュは、全パッケージファイルを再解析を避ける上で便利です。設定項目 - " +"<literal>Dir::Cache::srcpkgcache</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346 +msgid "<option>-q</option>" +msgstr "<option>-q</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346 +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:296 +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 " +"<option>-q=#</option> to set the quietness level, overriding the " +"configuration file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。最大 2 つまで q " +"を重ねることでさらに静粛にできます。また、<option>-q=#</option> のように静粛" +"レベルを指定して、設定ファイルを上書きすることもできます。設定項目 - " +"<literal>quiet</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:302 +msgid "<option>-i</option>" +msgstr "<option>-i</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:302 +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:303 +msgid "" +"Print only important dependencies; for use with unmet and depends. Causes " +"only Depends and Pre-Depends relations to be printed. Configuration Item: " +"<literal>APT::Cache::Important</literal>." +msgstr "" +"「重要」依存関係のみ表示 - unmet や depends と共に使用します。これは「依存」" +"関係と「先行依存」関係のみを表示するためです。設定項目 - <literal>APT::" +"Cache::Important</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:308 apt-cdrom.8.xml:120 apt-get.8.xml:313 +msgid "<option>-f</option>" +msgstr "<option>-f</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:308 +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:309 +msgid "" +"Print full package records when searching. Configuration Item: " +"<literal>APT::Cache::ShowFull</literal>." +msgstr "" +"search 時に全パッケージレコードを表示します。設定項目 - <literal>APT::Cache::" +"ShowFull</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:313 apt-cdrom.8.xml:130 +msgid "<option>-a</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:313 +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:314 +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-" +"versions</option> is specified, only the candidate version will displayed " +"(the one which would be selected for installation). This option is only " +"applicable to the <literal>show</literal> command. Configuration Item: " +"<literal>APT::Cache::AllVersions</literal>." +msgstr "" +"全利用可能バージョンのレコード全体を表示します。これはデフォルトの動作で、無" +"効にするには <option>--no-all-versions</option> を使用してください。" +"<option>--no-all-versions</option> を指定すると、候補バージョン (インストール" +"の際に選択されるもの) だけ表示します。このオプションは、show コマンドでのみ適" +"用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:322 +msgid "<option>-g</option>" +msgstr "<option>-g</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:322 +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:323 +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</" +"option>. Configuration Item: <literal>APT::Cache::Generate</literal>." +msgstr "" +"そのままキャッシュを使用するのではなく、自動的にパッケージキャッシュを再生成" +"します。これはデフォルトの動作で、無効にするには <option>--no-generate</" +"option> を使用してください。設定項目 - <literal>APT::Cache::Generate</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:328 +msgid "<option>--names-only</option>" +msgstr "<option>--names-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:328 apt-cdrom.8.xml:138 +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:329 +msgid "" +"Only search on the package names, not the long descriptions. Configuration " +"Item: <literal>APT::Cache::NamesOnly</literal>." +msgstr "" +"説明文ではなく、パッケージ名からのみ検索します。設定項目 - <literal>APT::" +"Cache::NamesOnly</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:333 +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:334 +msgid "" +"Make <literal>pkgnames</literal> print all names, including virtual packages " +"and missing dependencies. Configuration Item: <literal>APT::Cache::" +"AllNames</literal>." +msgstr "" +"<literal>pkgnames</literal> で、仮想パッケージや欠落依存関係を含めた全名称を" +"表示します。設定項目 - <literal>APT::Cache::AllNames</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:339 +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:340 +msgid "" +"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " +"that all packages mentioned are printed once. Configuration Item: " +"<literal>APT::Cache::RecurseDepends</literal>." +msgstr "" +"<literal>depends</literal> や <literal>rdepends</literal> で、指定した全パッ" +"ケージを再帰的に一度に表示します。設定項目 - <literal>APT::Cache::" +"RecurseDepends</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:345 +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:347 +msgid "" +"Limit the output of <literal>depends</literal> and <literal>rdepends</" +"literal> to packages which are currently installed. Configuration Item: " +"<literal>APT::Cache::Installed</literal>." +msgstr "" +"<literal>depends</literal> や <literal>rdepends</literal> の出力を、現在イン" +"ストールされているパッケージに限定します。設定項目 - <literal>APT::Cache::" +"Installed</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:352 apt-cdrom.8.xml:149 apt-config.8.xml:97 +#: apt-extracttemplates.1.xml:66 apt-ftparchive.1.xml:546 apt-get.8.xml:534 +#: apt-sortpkgs.1.xml:63 +msgid "&apt-commonoptions;" +msgstr "&apt-commonoptions;" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:357 apt-get.8.xml:539 apt-key.8.xml:137 apt.conf.5.xml:824 +msgid "Files" +msgstr "ファイル" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:359 apt-get.8.xml:541 +msgid "<filename>/etc/apt/sources.list</filename>" +msgstr "<filename>/etc/apt/sources.list</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:360 apt-get.8.xml:542 +msgid "" +"Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::" +"SourceList</literal>." +msgstr "パッケージの取得元。設定項目 - <literal>Dir::Etc::SourceList</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:364 apt-get.8.xml:575 +msgid "<filename>&statedir;/lists/</filename>" +msgstr "<filename>&statedir;/lists/</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:365 apt-get.8.xml:576 +msgid "" +"Storage area for state information for each package resource specified in " +"&sources-list; Configuration Item: <literal>Dir::State::Lists</literal>." +msgstr "" +"&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項" +"目 - <literal>Dir::State::Lists</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:370 apt-get.8.xml:581 +msgid "<filename>&statedir;/lists/partial/</filename>" +msgstr "<filename>&statedir;/lists/partial/</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:371 apt-get.8.xml:582 +msgid "" +"Storage area for state information in transit. Configuration Item: " +"<literal>Dir::State::Lists</literal> (implicit partial)." +msgstr "" +"取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必" +"然的に不完全)" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:377 apt-cdrom.8.xml:154 apt-config.8.xml:102 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:562 apt-get.8.xml:588 +#: apt-key.8.xml:161 apt-mark.8.xml:104 apt-secure.8.xml:180 +#: apt-sortpkgs.1.xml:68 apt.conf.5.xml:828 apt_preferences.5.xml:613 +#: sources.list.5.xml:220 +msgid "See Also" +msgstr "関連項目" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:378 +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:382 apt-cdrom.8.xml:159 apt-config.8.xml:107 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:566 apt-get.8.xml:594 +#: apt-mark.8.xml:108 apt-sortpkgs.1.xml:72 +msgid "Diagnostics" +msgstr "診断メッセージ" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:383 +msgid "" +"<command>apt-cache</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cache</command> は正常終了時に 0 を返します。エラー時には十進の " +"100 を返します。" + +#. type: Content of: <refentry><refentryinfo> +#: apt-cdrom.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:27 +msgid "apt-cdrom" +msgstr "apt-cdrom" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-cdrom.8.xml:28 +msgid "APT CDROM management utility" +msgstr "APT CDROM 管理ユーティリティ" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-cdrom.8.xml:34 +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>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>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:47 +msgid "" +"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"available sources. <command>apt-cdrom</command> takes care of determining " +"the structure of the disc as well as correcting for several possible mis-" +"burns and verifying the index files." +msgstr "" +"<command>apt-cdrom</command> は利用可能な取得元として、APT のリストに新しい " +"CDROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な" +"限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認を" +"行います。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:54 +msgid "" +"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " +"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"must be inserted and scanned separately to account for possible mis-burns." +msgstr "" +"APT システムに手作業で CD を追加するのは難しいため、<command>apt-cdrom</" +"command> が必要になります。その上、CD セットのディスクを 1 枚づつ、焼き損じを" +"補正できるか評価しなければなりません。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:64 +msgid "add" +msgstr "add" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:65 +msgid "" +"<literal>add</literal> is used to add a new disc to the source list. It will " +"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"to scan it and copy the index files. If the disc does not have a proper " +"<filename>disk</filename> directory you will be prompted for a descriptive " +"title." +msgstr "" +"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ" +"バイスのアンマウント、ディスク挿入のプロンプトの表示の後に、ディスクのスキャ" +"ンとインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</" +"filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:73 +msgid "" +"APT uses a CDROM ID to track which disc is currently in the drive and " +"maintains a database of these IDs in <filename>&statedir;/cdroms.list</" +"filename>" +msgstr "" +"APT は、現在ドライブにあるディスクのトラックから取得した、CDROM ID を使用しま" +"す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ" +"ベースで管理します。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:80 +msgid "ident" +msgstr "ident" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:81 +msgid "" +"A debugging tool to report the identity of the current disc as well as the " +"stored file name" +msgstr "" +"格納されているファイル名と現在のディスクが同一かどうかをレポートする、デバッ" +"グツールです。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:60 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present. <placeholder type=\"variablelist" +"\" id=\"0\"/>" +msgstr "" +"<option>-h</option> オプションや <option>--help</option> オプションを除き、以" +"下に挙げるコマンドが必要です。<placeholder type=\"variablelist\" id=\"0\"/>" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-cdrom.8.xml:90 +msgid "Options" +msgstr "オプション" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:94 apt-ftparchive.1.xml:502 apt-get.8.xml:308 +msgid "<option>-d</option>" +msgstr "<option>-d</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:94 +msgid "<option>--cdrom</option>" +msgstr "<option>--cdrom</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:95 +msgid "" +"Mount point; specify the location to mount the cdrom. This mount point must " +"be listed in <filename>/etc/fstab</filename> and properly configured. " +"Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgstr "" +"マウントポイント - cdrom をマウントする場所を指定します。このマウントポイント" +"は、<filename>/etc/fstab</filename> に正しく設定されている必要があります。設" +"定項目 - <literal>Acquire::cdrom::mount</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:103 +msgid "<option>-r</option>" +msgstr "<option>-r</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:103 +msgid "<option>--rename</option>" +msgstr "<option>--rename</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:104 +msgid "" +"Rename a disc; change the label of a disk or override the disks given label. " +"This option will cause <command>apt-cdrom</command> to prompt for a new " +"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +msgstr "" +"ディスクの名前変更 - 指定した名前でディスクのラベルを変更・更新します。このオ" +"プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し" +"ます。設定項目 - <literal>APT::CDROM::Rename</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:112 apt-get.8.xml:327 +msgid "<option>-m</option>" +msgstr "<option>-m</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:112 +msgid "<option>--no-mount</option>" +msgstr "<option>--no-mount</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:113 +msgid "" +"No mounting; prevent <command>apt-cdrom</command> from mounting and " +"unmounting the mount point. Configuration Item: <literal>APT::CDROM::" +"NoMount</literal>." +msgstr "" +"マウントなし - <command>apt-cdrom</command> が、マウントポイントにマウント・" +"アンマウントしないようにします。設定項目 - <literal>APT::CDROM::NoMount</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:120 +msgid "<option>--fast</option>" +msgstr "<option>--fast</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:121 +msgid "" +"Fast Copy; Assume the package files are valid and do not check every " +"package. This option should be used only if <command>apt-cdrom</command> has " +"been run on this disc before and did not detect any errors. Configuration " +"Item: <literal>APT::CDROM::Fast</literal>." +msgstr "" +"高速コピー - パッケージファイルが妥当であると仮定し、チェックを全く行いませ" +"ん。このオプションは、このディスクで以前 <command>apt-cdrom</command> を行っ" +"ており、エラーを検出しなかった場合のみ使用すべきです。設定項目 - " +"<literal>APT::CDROM::Fast</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:130 +msgid "<option>--thorough</option>" +msgstr "<option>--thorough</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:131 +msgid "" +"Thorough Package Scan; This option may be needed with some old Debian " +"1.1/1.2 discs that have Package files in strange places. It takes much " +"longer to scan the CD but will pick them all up." +msgstr "" +"完全パッケージスキャン - 古い Debian 1.1/1.2 のディスクは、パッケージファイル" +"が違う場所にあるため、このオプションを使う必要があるかもしれません。CD をス" +"キャンするのに非常に時間がかかりますが、全パッケージファイルを抽出することが" +"できます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:139 apt-get.8.xml:358 +msgid "<option>--just-print</option>" +msgstr "<option>--just-print</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:140 apt-get.8.xml:360 +msgid "<option>--recon</option>" +msgstr "<option>--recon</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:141 apt-get.8.xml:361 +msgid "<option>--no-act</option>" +msgstr "<option>--no-act</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:142 +msgid "" +"No Changes; Do not change the &sources-list; file and do not write index " +"files. Everything is still checked however. Configuration Item: " +"<literal>APT::CDROM::NoAct</literal>." +msgstr "" +"変更なし - &sources-list; ファイルの変更や、インデックスファイルの書き込みを" +"行いません。とはいえ、すべてのチェックは行います。設定項目 - <literal>APT::" +"CDROM::NoAct</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:155 +msgid "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-conf;, &apt-get;, &sources-list;" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:160 +msgid "" +"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cdrom</command> は正常終了時に 0 を返します。エラー時には十進の " +"100 を返します。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-config.8.xml:22 apt-config.8.xml:28 +msgid "apt-config" +msgstr "apt-config" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-config.8.xml:29 +msgid "APT Configuration Query program" +msgstr "APT 設定取得プログラム" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-config.8.xml:35 +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>config string</replaceable></option></arg> <arg><option>-" +"c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> " +"<arg>shell</arg> <arg>dump</arg> </group>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:47 +msgid "" +"<command>apt-config</command> is an internal program used by various " +"portions of the APT suite to provide consistent configurability. It accesses " +"the main configuration file <filename>/etc/apt/apt.conf</filename> in a " +"manner that is easy to use by scripted applications." +msgstr "" +"<command>apt-config</command> は、APT スイートの様々な所で一貫した設定を行う" +"ために使用する、内部ツールです。スクリプトアプリケーションで使いやすい方法" +"で、メイン設定ファイル <filename>/etc/apt/apt.conf</filename> にアクセスしま" +"す。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:52 apt-ftparchive.1.xml:70 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present." +msgstr "" +"<option>-h</option> オプションや <option>--help</option> オプションを除き、以" +"下に挙げるコマンドが必要です。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:57 +msgid "shell" +msgstr "shell" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:59 +msgid "" +"shell is used to access the configuration information from a shell script. " +"It is given pairs of arguments, the first being a shell variable and the " +"second the configuration value to query. As output it lists a series of " +"shell assignments commands for each present value. In a shell script it " +"should be used like:" +msgstr "" +"shell は、シェルスクリプトから設定情報にアクセスするのに使用します。引数とし" +"て、まずシェル変数、次に取得したい設定値をペアで与えます。出力として、現在の" +"値ごとにシェル代入コマンドの一覧を表示します。シェルスクリプト内では、以下の" +"ようにしてください。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-config.8.xml:67 +#, no-wrap +msgid "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" +msgstr "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:72 +msgid "" +"This will set the shell environment variable $OPTS to the value of MyApp::" +"options with a default of <option>-f</option>." +msgstr "" +"これは、MyApp::options の値をシェル環境変数 $OPTS にセットします。デフォルト" +"値は <option>-f</option> となります。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:76 +msgid "" +"The configuration item may be postfixed with a /[fdbi]. f returns file " +"names, d returns directories, b returns true or false and i returns an " +"integer. Each of the returns is normalized and verified internally." +msgstr "" +"設定項目は /[fdbi] を後ろに付けられます。f はファイル名を、d はディレクトリ" +"を、b は true か false を、i は整数を返します。返り値ごとに内部で正規化と検証" +"を行います。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:85 +msgid "Just show the contents of the configuration space." +msgstr "設定箇所の内容を表示するだけです。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 +#: apt-mark.8.xml:105 apt-sortpkgs.1.xml:69 +msgid "&apt-conf;" +msgstr "&apt-conf;" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:108 +msgid "" +"<command>apt-config</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-config</command> は正常終了時に 0 を返します。エラー時には十進" +"の 100 を返します。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:28 +msgid "apt-extracttemplates" +msgstr "apt-extracttemplates" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 +msgid "1" +msgstr "1" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-extracttemplates.1.xml:29 +msgid "Utility to extract DebConf config and templates from Debian packages" +msgstr "" +"Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ" +"ティ" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-extracttemplates.1.xml:35 +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>temporary directory</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></" +"arg>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:43 +msgid "" +"<command>apt-extracttemplates</command> will take one or more Debian package " +"files as input and write out (to a temporary directory) all associated " +"config scripts and template files. For each passed in package that contains " +"config scripts and templates, one line of output will be generated in the " +"format:" +msgstr "" +"<command>apt-extracttemplates</command> は、入力に複数の Debian パッケージを" +"とり、関連する設定スクリプトとテンプレートファイルを (一時ディレクトリに) 出" +"力します。設定スクリプト・テンプレートファイルを持つ、渡されたパッケージそれ" +"ぞれに対し、以下の形式で 1 行ずつ出力します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:48 +msgid "package version template-file config-script" +msgstr "package version template-file config-script" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:49 +msgid "" +"template-file and config-script are written to the temporary directory " +"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</" +"literal>) directory, with filenames of the form <filename>package.template." +"XXXX</filename> and <filename>package.config.XXXX</filename>" +msgstr "" +"テンプレートファイルや、設定スクリプトは、-t や --tempdir で指定した一時ディ" +"レクトリ (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、" +"ファイル名は、<filename>package.template.XXXX</filename> や " +"<filename>package.config.XXXX</filename> と言った形になります。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:59 apt-get.8.xml:468 +msgid "<option>-t</option>" +msgstr "<option>-t</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:59 +msgid "<option>--tempdir</option>" +msgstr "<option>--tempdir</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-extracttemplates.1.xml:61 +msgid "" +"Temporary directory in which to write extracted debconf template files and " +"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</" +"literal>" +msgstr "" +"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト" +"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:78 +msgid "" +"<command>apt-extracttemplates</command> returns zero on normal operation, " +"decimal 100 on error." +msgstr "" +"<command>apt-extracttemplates</command> は正常終了時に 0 を返します。エラー時" +"には十進の 100 を返します。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:28 +msgid "apt-ftparchive" +msgstr "apt-ftparchive" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-ftparchive.1.xml:29 +msgid "Utility to generate index files" +msgstr "インデックスファイル生成ユーティリティ" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-ftparchive.1.xml:35 +msgid "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=" +"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></" +"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></" +"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</" +"replaceable></arg> <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" +"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" +msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=" +"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></" +"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></" +"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</" +"replaceable></arg> <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" +"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:55 +msgid "" +"<command>apt-ftparchive</command> is the command line tool that generates " +"the index files that APT uses to access a distribution source. The index " +"files should be generated on the origin site based on the content of that " +"site." +msgstr "" +"<command>apt-ftparchive</command> は、APT が取得元にアクセスするのに必要な、" +"インデックスファイルを生成するコマンドラインツールです。インデックスファイル" +"は、元のサイトの内容に基づき生成されるべきです。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:59 +msgid "" +"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " +"program, incorporating its entire functionality via the <literal>packages</" +"literal> command. It also contains a contents file generator, " +"<literal>contents</literal>, and an elaborate means to 'script' the " +"generation process for a complete archive." +msgstr "" +"<command>apt-ftparchive</command> は、&dpkg-scanpackages; プログラムのスー" +"パーセットで、<literal>packages</literal> コマンド経由で機能全体を取り込んで" +"います。また、contents ファイルジェネレータ <literal>contents</literal> と完" +"全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:65 +msgid "" +"Internally <command>apt-ftparchive</command> can make use of binary " +"databases to cache the contents of a .deb file and it does not rely on any " +"external programs aside from &gzip;. When doing a full generate it " +"automatically performs file-change checks and builds the desired compressed " +"output files." +msgstr "" +"本質的に <command>apt-ftparchive</command> は、.deb ファイルの内容をキャッ" +"シュするのにバイナリデータベースを使用できます。また、&gzip; 以外のいかなる外" +"部プログラムにも依存しません。すべて生成する際には、ファイル変更点の検出と希" +"望した圧縮出力ファイルの作成を自動的に実行します。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:74 +msgid "packages" +msgstr "packages" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:76 +msgid "" +"The packages command generates a package file from a directory tree. It " +"takes the given directory and recursively searches it for .deb files, " +"emitting a package record to stdout for each. This command is approximately " +"equivalent to &dpkg-scanpackages;." +msgstr "" +"packages コマンドは、ディレクトリツリーからパッケージファイルを生成します。与" +"えられたディレクトリから再帰検索し、.deb ファイルを取得します。またパッケージ" +"レコードを標準出力にそれぞれ出力します。このコマンドは、&dpkg-scanpackages; " +"とほぼ同じです。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:81 apt-ftparchive.1.xml:105 +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." +msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:84 +msgid "sources" +msgstr "sources" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:86 +msgid "" +"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, emitting a source record to stdout for each. This command is " +"approximately equivalent to &dpkg-scansources;." +msgstr "" +"<literal>sources</literal> コマンドは、ディレクトリツリーからソースインデック" +"スファイルを生成します。与えられたディレクトリから再帰検索し、.dsc ファイルを" +"取得します。またソースレコードを標準出力にそれぞれ出力します。このコマンド" +"は、&dpkg-scansources; とほぼ同じです。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:91 +msgid "" +"If an override file is specified then a source override file will be looked " +"for with an extension of .src. The --source-override option can be used to " +"change the source override file that will be used." +msgstr "" +"override ファイルを指定した場合、src 拡張子がついたソースオーバーライドファイ" +"ルを探します。使用するソースオーバーライドファイルを変更するのには、--source-" +"override オプションを使用します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:96 +msgid "contents" +msgstr "contents" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:98 +msgid "" +"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, and reads the file list from each file. It then sorts and " +"writes to stdout the list of files matched to packages. Directories are not " +"written to the output. If multiple packages own the same file then each " +"package is separated by a comma in the output." +msgstr "" +"<literal>contents</literal> コマンドは、ディレクトリツリーからコンテンツファ" +"イルを生成します。与えられたディレクトリから再帰検索し、.deb ファイルを取得し" +"ます。またファイルごとにファイル一覧を読み取ります。その後、パッケージに対応" +"するファイル一覧を標準出力にソートして出力します。ディレクトリは出力に含まれ" +"ません。複数のパッケージが同じファイルを持つ場合、パッケージ名をカンマ区切り" +"で出力します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:108 +msgid "release" +msgstr "release" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:110 +msgid "" +"The <literal>release</literal> command generates a Release file from a " +"directory tree. It recursively searches the given directory for Packages, " +"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " +"md5sum.txt files. It then writes to stdout a Release file containing an MD5 " +"digest and SHA1 digest for each file." +msgstr "" +"<literal>release</literal> コマンドは、ディレクトリツリーから Release ファイ" +"ルを生成します。与えられたディレクトリから、Packages, Packages.gz, Packages." +"bz2, Sources, Sources.gz, Sources.bz2, Release, md5sum.txt といったファイルを" +"再帰検索します。その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを" +"含んだ Release ファイルを、標準出力に書き出します。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:117 +msgid "" +"Values for the additional metadata fields in the Release file are taken from " +"the corresponding variables under <literal>APT::FTPArchive::Release</" +"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal>." +msgstr "" +"Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::" +"Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::" +"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</" +"literal>, <literal>Label</literal>, <literal>Suite</literal>, " +"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</" +"literal>, <literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal> です。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:127 +msgid "generate" +msgstr "generate" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:129 +msgid "" +"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 provides a flexible means of specifying which index files " +"are built from which directories, as well as providing a simple means of " +"maintaining the required settings." +msgstr "" +"<literal>generate</literal> コマンドは、cron スクリプトから実行できるよう設計" +"されており、与えられた設定ファイルに従ってインデックスを生成します。設定言語" +"は、必要な設定を維持する簡単な方法を提供すると共に、インデックスファイルをど" +"のディレクトリから作成するかを指定する、柔軟な方法を提供します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:136 apt-get.8.xml:272 +msgid "clean" +msgstr "clean" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:138 +msgid "" +"The <literal>clean</literal> command tidies the databases used by the given " +"configuration file by removing any records that are no longer necessary." +msgstr "" +"<literal>clean</literal> コマンドは、設定ファイルで与えられたデータベースを、" +"もう必要ないレコードを削除して整理します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:144 +msgid "The Generate Configuration" +msgstr "Generate 設定" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:146 +msgid "" +"The <literal>generate</literal> command uses a configuration file to " +"describe the archives that are going to be generated. It follows the typical " +"ISC configuration format as seen in ISC tools like bind 8 and dhcpd. &apt-" +"conf; contains a description of the syntax. Note that the generate " +"configuration is parsed in sectional manner, but &apt-conf; is parsed in a " +"tree manner. This only effects how the scope tag is handled." +msgstr "" +"<literal>generate</literal> コマンドは、生成するアーカイブに関する記述をした" +"設定ファイルを使用します。設定ファイルは、bind 8 や dhcpd といった ISC ツール" +"に見られるような、ISC 設定フォーマットに従います。&apt-conf; に、文法の説明が" +"あります。Generate 設定はセクション法で解析しますが、&apt-conf; はツリー法で" +"解析するのに注意してください。これはスコープタグの扱い方に違いがあるだけで" +"す。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:154 +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"generate 設定には 4 個の独立したセクションがあります。以下それぞれ説明しま" +"す。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:156 +msgid "Dir Section" +msgstr "Dir セクション" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:158 +msgid "" +"The <literal>Dir</literal> section defines the standard directories needed " +"to locate the files required during the generation process. These " +"directories are prepended to certain relative paths defined in later " +"sections to produce a complete an absolute path." +msgstr "" +"<literal>Dir</literal> セクションは、生成プロセスで必要なファイルを配置するた" +"めの、標準ディレクトリを定義します。このディレクトリは、完全な絶対パスを生成" +"するため、後のセクションで定義される相対パスの前に結合します。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:163 +msgid "ArchiveDir" +msgstr "ArchiveDir" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:165 +msgid "" +"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." +msgstr "" +"FTP アーカイブのルートを指定します。標準的な Debian 設定では、このディレクト" +"リには <filename>ls-LR</filename> と dist ノードがあります。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:170 +msgid "OverrideDir" +msgstr "OverrideDir" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:172 +msgid "Specifies the location of the override files." +msgstr "オーバーライドファイルの場所を指定します。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:175 +msgid "CacheDir" +msgstr "CacheDir" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:177 +msgid "Specifies the location of the cache files" +msgstr "キャッシュファイルの場所を指定します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:180 +msgid "FileListDir" +msgstr "FileListDir" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:182 +msgid "" +"Specifies the location of the file list files, if the <literal>FileList</" +"literal> setting is used below." +msgstr "" +"<literal>FileList</literal> 設定が以下で使用されている場合、ファイルリスト" +"ファイルの場所を指定します。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:188 +msgid "Default Section" +msgstr "Default セクション" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:190 +msgid "" +"The <literal>Default</literal> section specifies default values, and " +"settings that control the operation of the generator. Other sections may " +"override these defaults with a per-section setting." +msgstr "" +"<literal>Default</literal> セクションではデフォルト値を指定します。また、生成" +"器の動作を制御する設定も行います。他のセクションでは、ここにあるデフォルト値" +"を、セクションごとの設定で上書きします。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:194 +msgid "Packages::Compress" +msgstr "Packages::Compress" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:196 +msgid "" +"Sets the default compression schemes to use for the Package index files. It " +"is a string that contains a space separated list of at least one of: '.' (no " +"compression), 'gzip' and 'bzip2'. The default for all compression schemes is " +"'. gzip'." +msgstr "" +"Package インデックスファイルのデフォルトの圧縮方法を設定します。少なくともひ" +"とつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、空白区切りの文字列です。圧縮方" +"法のデフォルトはすべて '. gzip' です。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:202 +msgid "Packages::Extensions" +msgstr "Packages::Extensions" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:204 +msgid "" +"Sets the default list of file extensions that are package files. This " +"defaults to '.deb'." +msgstr "" +"パッケージファイル拡張子のデフォルト値を列挙します。このデフォルト値は '." +"deb' です。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:208 +msgid "Sources::Compress" +msgstr "Sources::Compress" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:210 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Sources files." +msgstr "" +"<literal>Packages::Compress</literal> と同様に、Sources ファイルの圧縮方法を" +"指定します。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:214 +msgid "Sources::Extensions" +msgstr "Sources::Extensions" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:216 +msgid "" +"Sets the default list of file extensions that are source files. This " +"defaults to '.dsc'." +msgstr "" +"ソースファイル拡張子のデフォルト値を列挙します。このデフォルト値は '.dsc' で" +"す。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:220 +msgid "Contents::Compress" +msgstr "Contents::Compress" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:222 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Contents files." +msgstr "" +"<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を" +"指定します。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:226 +msgid "DeLinkLimit" +msgstr "DeLinkLimit" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:228 +msgid "" +"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." +msgstr "" +"実行するごとに delink (及びハードリンクの置き換え) する量を、キロバイト単位で" +"指定します。セクションごとの <literal>External-Links</literal> 設定と合わせて" +"使います。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:233 +msgid "FileMode" +msgstr "FileMode" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:235 +msgid "" +"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." +msgstr "" +"作成したインデックスファイルのモードを指定します。デフォルトは 0644 です。全" +"インデックスファイルは、umask を無視してこのモードを使用します。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:242 +msgid "TreeDefault Section" +msgstr "TreeDefault セクション" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:244 +msgid "" +"Sets defaults specific to <literal>Tree</literal> sections. All of these " +"variables are substitution variables and have the strings $(DIST), " +"$(SECTION) and $(ARCH) replaced with their respective values." +msgstr "" +"特定の <literal>Tree</literal> セクションのデフォルトを設定します。これらの変" +"数はすべて置換変数であり、文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値" +"に展開します。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:249 +msgid "MaxContentsChange" +msgstr "MaxContentsChange" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:251 +msgid "" +"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." +msgstr "" +"日毎に生成する contents ファイルをキロバイト単位で設定します。contents ファイ" +"ルをラウンドロビンし、数日経つとすべて再生成します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:256 +msgid "ContentsAge" +msgstr "ContentsAge" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:258 +msgid "" +"Controls the number of days a contents file is allowed to be checked without " +"changing. If this limit is passed the mtime of the contents file is updated. " +"This case can occur if the package file is changed in such a way that does " +"not result in a new contents file [override edit for instance]. A hold off " +"is allowed in hopes that new .debs will be installed, requiring a new file " +"anyhow. The default is 10, the units are in days." +msgstr "" +"変更がない contents ファイルをチェックする日数を指定します。この制限を越えた " +"contents ファイルの mtime を、更新します。パッケージファイルが変更されても、" +"[例えば上書き編集で] contents ファイルが更新されないような場合、こういったこ" +"とが発生します。新しい .deb ファイルをインストールしたい場合、保留を解除で" +"き、少なくとも新しいファイルが必要です。デフォルトは 10 で、単位は日です。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:267 +msgid "Directory" +msgstr "Directory" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:269 +msgid "" +"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename>" +msgstr "" +".deb ディレクトリツリーの先頭を設定します。デフォルトは <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename> です。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:273 +msgid "SrcDirectory" +msgstr "SrcDirectory" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:275 +msgid "" +"Sets the top of the source package directory tree. Defaults to <filename>" +"$(DIST)/$(SECTION)/source/</filename>" +msgstr "" +"ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは <filename>" +"$(DIST)/$(SECTION)/source/</filename> です。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:405 +msgid "Packages" +msgstr "Packages" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:281 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"binary-$(ARCH)/Packages</filename>" +msgstr "" +"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/Packages</filename> です。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:410 +msgid "Sources" +msgstr "Sources" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:287 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"source/Sources</filename>" +msgstr "" +"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/" +"$(SECTION)/source/Sources</filename> です。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:291 +msgid "InternalPrefix" +msgstr "InternalPrefix" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:293 +msgid "" +"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>" +msgstr "" +"外部リンクではなく、内部リンクと見なす判断材料となる、パスのプレフィックスを" +"設定します。デフォルトは、<filename>$(DIST)/$(SECTION)/</filename> です。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:416 +msgid "Contents" +msgstr "Contents" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:300 +msgid "" +"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" +"</filename>. If this setting causes multiple Packages files to map onto a " +"single Contents file (such as the default) then <command>apt-ftparchive</" +"command> will integrate those package files together automatically." +msgstr "" +"Contents ファイルの出力先を設定します。デフォルトは、<filename>$(DIST)/" +"Contents-$(ARCH)</filename> です。複数の Packages ファイルをひとつの " +"Contents ファイルにまとめられる設定 (デフォルト) の場合、<command>apt-" +"ftparchive</command> は自動でパッケージファイルをまとめます。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:307 +msgid "Contents::Header" +msgstr "Contents::Header" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:309 +msgid "Sets header file to prepend to the contents output." +msgstr "contents の出力に付けるヘッダファイルを設定します。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:312 apt-ftparchive.1.xml:441 +msgid "BinCacheDB" +msgstr "BinCacheDB" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:314 +msgid "" +"Sets the binary cache database to use for this section. Multiple sections " +"can share the same database." +msgstr "" +"このセクションで使用するバイナリキャッシュデータベースを設定します。複数のセ" +"クションで同じデータベースを共有できます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:318 +msgid "FileList" +msgstr "FileList" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:320 +msgid "" +"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." +msgstr "" +"ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command> が読" +"み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク" +"トリが先頭につきます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:325 +msgid "SourceFileList" +msgstr "SourceFileList" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:327 +msgid "" +"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. This is used " +"when processing source indexes." +msgstr "" +"ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command> が読" +"み込むファイル一覧ファイルを指定します。相対ファイル名は、アーカイブディレク" +"トリが先頭につきます。ソースインデックスを処理する際に使用します。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:335 +msgid "Tree Section" +msgstr "Tree セクション" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:337 +msgid "" +"The <literal>Tree</literal> section defines a standard Debian file tree " +"which consists of a base directory, then multiple sections in that base " +"directory and finally multiple Architectures in each section. The exact " +"pathing used is defined by the <literal>Directory</literal> substitution " +"variable." +msgstr "" +"<literal>Tree</literal> セクションでは、ベースディレクトリからの標準 Debian " +"ファイルツリー、ベースディレクトリの複数のセクション、最終的にはセクションご" +"との複数のアーキテクチャを定義します。使用する正確なパスは、" +"<literal>Directory</literal> 変数で定義されます。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:342 +msgid "" +"The <literal>Tree</literal> section takes a scope tag which sets the " +"<literal>$(DIST)</literal> variable and defines the root of the tree (the " +"path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " +"setting such as <filename>dists/woody</filename>." +msgstr "" +"<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ" +"れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先" +"頭につくパス) を定義します。通常、この設定は <filename>dists/woody</" +"filename> のようになります。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:347 +msgid "" +"All of the settings defined in the <literal>TreeDefault</literal> section " +"can be use in a <literal>Tree</literal> section as well as three new " +"variables." +msgstr "" +"<literal>TreeDefault</literal> セクションで定義される設定はすべて、3 個の新し" +"い変数と同様に、<literal>Tree</literal> セクションで使用できます。" + +# type: Content of: <refentry><refsect1><refsect2><para><informalexample> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:350 +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to:" +msgstr "" +"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</" +"command> は以下のような操作を行います。" + +# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#: apt-ftparchive.1.xml:353 +#, no-wrap +msgid "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +msgstr "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:359 +msgid "Sections" +msgstr "Sections" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:361 +msgid "" +"This is a space separated list of sections which appear under the " +"distribution, typically this is something like <literal>main contrib non-" +"free</literal>" +msgstr "" +"distribution 以下に現れるセクションを、空白区切りで指定したリストです。通常、" +"<literal>main contrib non-free</literal>のようになります。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:366 +msgid "Architectures" +msgstr "Architectures" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:368 +msgid "" +"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." +msgstr "" +"search セクション以下に現れるアーキテクチャを、空白区切りで指定したリストで" +"す。特殊アーキテクチャ 'source' は、ソースアーカイブのツリーであることを示し" +"ます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:373 apt-ftparchive.1.xml:421 +msgid "BinOverride" +msgstr "BinOverride" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:375 +msgid "" +"Sets the binary override file. The override file contains section, priority " +"and maintainer address information." +msgstr "" +"バイナリオーバーライドファイルを設定します。このオーバーライドファイルには、" +"セクション、優先度、メンテナのアドレスといった情報が含まれています。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:379 apt-ftparchive.1.xml:426 +msgid "SrcOverride" +msgstr "SrcOverride" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:381 +msgid "" +"Sets the source override file. The override file contains section " +"information." +msgstr "" +"ソースオーバーライドファイルを設定します。このオーバーライドファイルには、セ" +"クションの情報が含まれています。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:385 apt-ftparchive.1.xml:431 +msgid "ExtraOverride" +msgstr "ExtraOverride" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 +msgid "Sets the binary extra override file." +msgstr "バイナリ特別オーバーライドファイルを設定します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:390 apt-ftparchive.1.xml:436 +msgid "SrcExtraOverride" +msgstr "SrcExtraOverride" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 +msgid "Sets the source extra override file." +msgstr "ソース特別オーバーライドファイルを設定します。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:397 +msgid "BinDirectory Section" +msgstr "BinDirectory セクション" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:399 +msgid "" +"The <literal>bindirectory</literal> section defines a binary directory tree " +"with no special structure. The scope tag specifies the location of the " +"binary directory and the settings are similar to the <literal>Tree</literal> " +"section with no substitution variables or <literal>Section</" +"literal><literal>Architecture</literal> settings." +msgstr "" +"<literal>bindirectory</literal> セクションでは、特殊な構造を持たないバイナリ" +"ディレクトリツリーを定義します。スコープタグはバイナリディレクトリの場所を指" +"定し、設定は変数展開のない <literal>Tree</literal> セクションや " +"<literal>Section</literal><literal>Architecture</literal> 設定に似ています。" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:407 +msgid "Sets the Packages file output." +msgstr "Packages ファイルの出力先を設定します。" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:412 +msgid "" +"Sets the Sources file output. At least one of <literal>Packages</literal> or " +"<literal>Sources</literal> is required." +msgstr "" +"Sources ファイルの出力先を設定します。少なくとも <literal>Packages</literal> " +"や <literal>SrcPackages</literal> は設定されていなければなりません。" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:418 +msgid "Sets the Contents file output. (optional)" +msgstr "Contents ファイルの出力先を設定します。(オプション)" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:423 +msgid "Sets the binary override file." +msgstr "バイナリオーバーライドファイルを設定します。" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:428 +msgid "Sets the source override file." +msgstr "ソースオーバーライドファイルを設定します。" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:443 +msgid "Sets the cache DB." +msgstr "キャッシュ DB を設定します。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:446 +msgid "PathPrefix" +msgstr "PathPrefix" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:448 +msgid "Appends a path to all the output paths." +msgstr "全出力パスに付加するパス。" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:451 +msgid "FileList, SourceFileList" +msgstr "FileList, SourceFileList" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:453 +msgid "Specifies the file list file." +msgstr "ファイル一覧ファイルを指定します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:460 +msgid "The Binary Override File" +msgstr "バイナリオーバーライドファイル" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:461 +msgid "" +"The binary override file is fully compatible with &dpkg-scanpackages;. It " +"contains 4 fields separated by spaces. The first field is the package name, " +"the second is the priority to force that package to, the third is the the " +"section to force that package to and the final field is the maintainer " +"permutation field." +msgstr "" +"バイナリオーバーライドファイルは、&dpkg-scanpackages; と完全に互換性がありま" +"す。ここには、空白区切りでフィールドが 4 個あります。先頭のフィールドはパッ" +"ケージ名、2 番目のフィールドはパッケージに強制する優先度、3 番目のフィールド" +"はパッケージに強制するセクション、最後のフィールドはメンテナ順列フィールドで" +"す。" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:467 +#, no-wrap +msgid "old [// oldn]* => new" +msgstr "old [// oldn]* => new" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:469 +#, no-wrap +msgid "new" +msgstr "new" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:466 +msgid "" +"The general form of the maintainer field is: <placeholder type=" +"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " +"id=\"1\"/> The first form allows a double-slash separated list of old email " +"addresses to be specified. If any of those are found then new is substituted " +"for the maintainer field. The second form unconditionally substitutes the " +"maintainer field." +msgstr "" +"メンテナフィールドの一般的な形は以下のようになります。<placeholder type=" +"\"literallayout\" id=\"0\"/> また単純に以下のようにもなります。<placeholder " +"type=\"literallayout\" id=\"1\"/>最初の形式は、// で区切られた古い email アド" +"レスのリストを許可します。この形式がある場合は、メンテナフィールドになるよう " +"new に置換してください。2 番目の形式は無条件にメンテナフィールドに置換しま" +"す。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:477 +msgid "The Source Override File" +msgstr "ソースオーバーライドファイル" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:479 +msgid "" +"The source override file is fully compatible with &dpkg-scansources;. It " +"contains 2 fields separated by spaces. The first fields is the source " +"package name, the second is the section to assign it." +msgstr "" +"ソースオーバーライドファイルは、&dpkg-scansources; と完全に互換性があります。" +"ここには、空白区切りでフィールドが 2 個あります。先頭のフィールドはソースパッ" +"ケージ名、2 番目のフィールドは割り当てるセクションです。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:484 +msgid "The Extra Override File" +msgstr "特別オーバーライドファイル" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:486 +msgid "" +"The extra override file allows any arbitrary tag to be added or replaced in " +"the output. It has 3 columns, the first is the package, the second is the " +"tag and the remainder of the line is the new value." +msgstr "" +"特別オーバーライドファイルは、出力中に任意のタグを追加・置換できるようにしま" +"す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:495 +msgid "<option>--md5</option>" +msgstr "<option>--md5</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:497 +msgid "" +"Generate MD5 sums. This defaults to on, when turned off the generated index " +"files will not have MD5Sum fields where possible. Configuration Item: " +"<literal>APT::FTPArchive::MD5</literal>" +msgstr "" +"MD5 sum を生成します。デフォルトで on になっており、off にすると生成したイン" +"デックスファイルに MD5Sum フィールドがありません。設定項目 - <literal>APT::" +"FTPArchive::MD5</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:502 +msgid "<option>--db</option>" +msgstr "<option>--db</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:504 +msgid "" +"Use a binary caching DB. This has no effect on the generate command. " +"Configuration Item: <literal>APT::FTPArchive::DB</literal>." +msgstr "" +"バイナリキャッシュ DB を使用します。generate コマンドには影響しません。設定項" +"目 - <literal>APT::FTPArchive::DB</literal>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:510 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。最大 2 つまで q " +"を重ねることでより静粛にできます。また、<option>-q=#</option> のように静粛レ" +"ベルを指定して、設定ファイルを上書きすることもできます。設定項目 - " +"<literal>quiet</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:516 +msgid "<option>--delink</option>" +msgstr "<option>--delink</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:518 +msgid "" +"Perform Delinking. If the <literal>External-Links</literal> setting is used " +"then this option actually enables delinking of the files. It defaults to on " +"and can be turned off with <option>--no-delink</option>. Configuration " +"Item: <literal>APT::FTPArchive::DeLinkAct</literal>." +msgstr "" +"Delink を実行します。<literal>External-Links</literal> 設定を使用している場" +"合、このオプションはファイルの delink を有効にします。デフォルトは on で、" +"off にするには <option>--no-delink</option> としてください。設定項目 - " +"<literal>APT::FTPArchive::DeLinkAct</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:524 +msgid "<option>--contents</option>" +msgstr "<option>--contents</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:526 +msgid "" +"Perform contents generation. When this option is set and package indexes are " +"being generated with a cache DB then the file listing will also be extracted " +"and stored in the DB for later use. When using the generate command this " +"option also allows the creation of any Contents files. The default is on. " +"Configuration Item: <literal>APT::FTPArchive::Contents</literal>." +msgstr "" +"contents の生成を行います。このオプションを指定し、パッケージインデックスを" +"キャッシュ DB と共に生成する際、ファイルリストを後で使用するように、抽出し " +"DB に格納します。generate コマンドを使用する際、このオプションでいずれの " +"Contents ファイルも作成できます。デフォルトは on です。設定項目 - " +"<literal>APT::FTPArchive::Contents</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:534 +msgid "<option>--source-override</option>" +msgstr "<option>--source-override</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:536 +msgid "" +"Select the source override file to use with the <literal>sources</literal> " +"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" +"literal>." +msgstr "" +"<literal>sources</literal> コマンドで使用する、ソースオーバーライドファイルを" +"選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:540 +msgid "<option>--readonly</option>" +msgstr "<option>--readonly</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:542 +msgid "" +"Make the caching databases read only. Configuration Item: <literal>APT::" +"FTPArchive::ReadOnlyDB</literal>." +msgstr "" +"キャッシュデータベースを読み取り専用にします。設定項目 - <literal>APT::" +"FTPArchive::ReadOnlyDB</literal>" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:551 apt.conf.5.xml:818 apt_preferences.5.xml:460 +#: sources.list.5.xml:180 +msgid "Examples" +msgstr "サンプル" + +# type: Content of: <refentry><refsect1><para><programlisting> +#. type: Content of: <refentry><refsect1><para><programlisting> +#: apt-ftparchive.1.xml:557 +#, no-wrap +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:553 +msgid "" +"To create a compressed Packages file for a directory containing binary " +"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"バイナリパッケージ (.deb) があるディレクトリの Packages ファイルを生成するに" +"は、以下のようにします。<placeholder type=\"programlisting\" id=\"0\"/>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:567 +msgid "" +"<command>apt-ftparchive</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-ftparchive</command> は正常終了時に 0 を返します。エラー時には十" +"進の 100 を返します。" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-get.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-get.8.xml:22 apt-get.8.xml:28 +msgid "apt-get" +msgstr "apt-get" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-get.8.xml:29 +msgid "APT package handling utility -- command-line interface" +msgstr "APT パッケージ操作ユーティリティ -- コマンドラインインターフェース" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-get.8.xml:35 +msgid "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </" +"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable> <arg> =<replaceable>pkg_version_number</" +"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +msgstr "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </" +"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable> <arg> =<replaceable>pkg_version_number</" +"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:115 +msgid "" +"<command>apt-get</command> is the command-line tool for handling packages, " +"and may be considered the user's \"back-end\" to other tools using the APT " +"library. Several \"front-end\" interfaces exist, such as &dselect;, " +"&aptitude;, &synaptic;, &gnome-apt; and &wajig;." +msgstr "" +"<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、" +"APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。" +"「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, " +"&gnome-apt;, &wajig; などがあります。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:124 apt-key.8.xml:122 +msgid "update" +msgstr "update" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:125 +msgid "" +"<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>. For " +"example, when using a Debian archive, this command retrieves and scans the " +"<filename>Packages.gz</filename> files, so that information about new and " +"updated packages is available. An <literal>update</literal> should always be " +"performed before an <literal>upgrade</literal> or <literal>dist-upgrade</" +"literal>. Please be aware that the overall progress meter will be incorrect " +"as the size of the package files cannot be known in advance." +msgstr "" +"<literal>update</literal>は、取得元からパッケージインデックスファイルの再同期" +"を行うのに使用します。利用可能なパッケージのインデックスは、<filename>/etc/" +"apt/sources.list</filename> に記述した場所から取得します。例えば Debian アー" +"カイブを利用する際、このコマンドが <filename>Packages.gz</filename> ファイル" +"を検索することで、新規または更新されたパッケージの情報が利用可能となります。" +"<literal>update</literal> は、<literal>upgrade</literal> や <literal>dist-" +"upgrade</literal> を行う前に常に実行してください。前もってパッケージファイル" +"のサイズを知ることができないため、全体の進捗メータは正しく表示されません。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:136 +msgid "upgrade" +msgstr "upgrade" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:137 +msgid "" +"<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 new versions available are retrieved and upgraded; under no " +"circumstances are currently installed packages removed, or packages not " +"already installed retrieved and installed. New versions of currently " +"installed packages that cannot be upgraded without changing the install " +"status of another package will be left at their current version. An " +"<literal>update</literal> must be performed first so that <command>apt-get</" +"command> knows that new versions of packages are available." +msgstr "" +"<literal>upgrade</literal> は、現在システムにインストールされている全パッケー" +"ジの最新バージョンを、<filename>/etc/apt/sources.list</filename> に列挙した取" +"得元からインストールするのに使用します。現在インストール中のパッケージに新し" +"いバージョンがあれば更新しますが、いかなる時も現在インストール中のパッケージ" +"の削除は行いません。対象のパッケージが、他のパッケージのインストール状態を変" +"更せずに更新できない場合は、現在のバージョンのままとなります。最初に " +"<literal>update</literal> を実行しておき、<command>apt-get</command> にパッ" +"ケージの新しいバージョンがあることを知らせる必要があります。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:149 +msgid "dselect-upgrade" +msgstr "dselect-upgrade" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:150 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" +"literal> follows the changes made by &dselect; to the <literal>Status</" +"literal> field of available packages, and performs the actions necessary to " +"realize that state (for instance, the removal of old and the installation of " +"new packages)." +msgstr "" +"<literal>dselect-upgrade</literal> は、伝統的な Debian GNU/Linux パッケージ管" +"理フロントエンドの &dselect; と共に使用されます。<literal>dselect-upgrade</" +"literal> は、&dselect; で作られた利用可能パッケージの<literal>Status</" +"literal> フィールドの変更を追跡し、その状態を反映させるのに必要なアクションを" +"実行します。(例えば、古いパッケージの削除や新しいパッケージのインストールな" +"ど)" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:159 +msgid "dist-upgrade" +msgstr "dist-upgrade" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:160 +msgid "" +"<literal>dist-upgrade</literal> in addition to performing the function of " +"<literal>upgrade</literal>, also intelligently handles changing dependencies " +"with new versions of packages; <command>apt-get</command> has a \"smart\" " +"conflict resolution system, and it will attempt to upgrade the most " +"important packages at the expense of less important ones if necessary. So, " +"<literal>dist-upgrade</literal> command may remove some packages. The " +"<filename>/etc/apt/sources.list</filename> file contains a list of locations " +"from which to retrieve desired package files. See also &apt-preferences; " +"for a mechanism for overriding the general settings for individual packages." +msgstr "" +"<literal>dist-upgrade</literal> は、<literal>upgrade</literal> の機能に加え、" +"新バージョンのパッケージに対する依存関係の変更を知的に操作します。" +"<command>apt-get</command> は「洗練された」競合解決システムを持ち、必要とあら" +"ば比較的重要でないパッケージを犠牲にして、最重要パッケージの更新を試みます。" +"そのため <literal>dist-upgrade</literal> は、いくつかのパッケージを削除する可" +"能性があります。<filename>/etc/apt/sources.list</filename> ファイルには、必要" +"なパッケージファイルを検索する場所のリストが含まれています。特定のパッケージ" +"向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ" +"さい。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:172 +msgid "install" +msgstr "install" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:174 +msgid "" +"<literal>install</literal> is followed by one or more packages desired for " +"installation or upgrading. Each package is a package name, not a fully " +"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " +"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " +"packages required by the package(s) specified for installation will also be " +"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " +"file is used to locate the desired packages. If a hyphen is appended to the " +"package name (with no intervening space), the identified package will be " +"removed if it is installed. Similarly a plus sign can be used to designate " +"a package to install. These latter features may be used to override " +"decisions made by apt-get's conflict resolution system." +msgstr "" +"<literal>install</literal> の後には、インストールするパッケージを 1 つ以上指" +"定します。指定するパッケージは、完全なファイル名ではなくパッケージ名です (例" +"えば Debian GNU/Linux システムでは、<literal>libc6_1.9.6-2.deb</literal> では" +"なく libc6 を引数として与えます)。インストールするよう指定したすべてのパッ" +"ケージに対し、取得・インストールを行います。<filename>/etc/apt/sources.list</" +"filename> ファイルを、要求するパッケージの場所を特定するのに使用します。パッ" +"ケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、そのパッケージ" +"がインストールされていれば削除します。同様に、インストールするパッケージを明" +"示するのにプラス記号も使用できます。この記号は apt-get の競合解決システムの判" +"断を上書きするのに利用される可能性があります。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:192 +msgid "" +"A specific version of a package can be selected for installation by " +"following the package name with an equals and the version of the package to " +"select. This will cause that version to be located and selected for install. " +"Alternatively a specific distribution can be selected by following the " +"package name with a slash and the version of the distribution or the Archive " +"name (stable, testing, unstable)." +msgstr "" +"パッケージにイコール記号とバージョンを続けることで、選択したバージョンのパッ" +"ケージをインストールすることができます。つまり、指定のバージョンのパッケージ" +"をインストールするように選択する、ということです。別の方法としては、ディスト" +"リビューションを特定するのに、パッケージ名に続けて、スラッシュとディストリ" +"ビューションのバージョンやアーカイブ名 (stable, testing, unstable) を記述でき" +"ます。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:199 +msgid "" +"Both of the version selection mechanisms can downgrade packages and must be " +"used with care." +msgstr "" +"バージョン選択機構はダウングレード時にも使用できるため、注意して使用しなけれ" +"ばなりません。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:202 +msgid "" +"This is also the target to use if you want to upgrade one or more already-" +"installed packages without upgrading every package you have on your system. " +"Unlike the \"upgrade\" target, which installs the newest version of all " +"currently installed packages, \"install\" will install the newest version of " +"only the package(s) specified. Simply provide the name of the package(s) " +"you wish to upgrade, and if a newer version is available, it (and its " +"dependencies, as described above) will be downloaded and installed." +msgstr "" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:213 +msgid "" +"Finally, the &apt-preferences; mechanism allows you to create an alternative " +"installation policy for individual packages." +msgstr "" +"最後に、&apt-preferences; 機構により、特定のパッケージに対するインストールポ" +"リシーを作成できます。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:217 +msgid "" +"If no package matches the given expression and the expression contains one " +"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " +"it is applied to all package names in the database. Any matches are then " +"installed (or removed). Note that matching is done by substring so 'lo.*' " +"matches 'how-lo' and 'lowest'. If this is undesired, anchor the regular " +"expression with a '^' or '$' character, or create a more specific regular " +"expression." +msgstr "" +"構文に '.', '?', '*' を含み、パッケージ名がマッチしなかった場合、POSIX 正規表" +"現であると見なし、データベース内の全パッケージ名に対して適用します。マッチし" +"たパッケージすべてがインストール(もしくは削除)されます。'lo.*' のような文字列" +"は、'how-lo' や 'lowest' にマッチすることに注意してください。そうしたくなけれ" +"ば、'^' や '$' を付けるか、もっと詳しい正規表現を指定してください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:226 +msgid "remove" +msgstr "remove" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:227 +msgid "" +"<literal>remove</literal> is identical to <literal>install</literal> except " +"that packages are removed instead of installed. Note the removing a package " +"leaves its configuration files in system. If a plus sign is appended to the " +"package name (with no intervening space), the identified package will be " +"installed instead of removed." +msgstr "" +"<literal>remove</literal> は、パッケージが削除されることを除き、" +"<literal>install</literal> と同様です。削除されたパッケージの設定ファイルは、" +"システムに残ったままになることに注意してください。プラス記号がパッケージ名に " +"(間に空白を含まずに) 付加されると、識別されたパッケージを、削除ではなくインス" +"トールします。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:234 +msgid "purge" +msgstr "purge" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:235 +msgid "" +"<literal>purge</literal> is identical to <literal>remove</literal> except " +"that packages are removed and purged (any configuration files are deleted " +"too)." +msgstr "" +"パッケージが削除かつ完全削除 (すべての設定ファイルも削除) されるのを除き、" +"<literal>purge</literal> は <literal>remove</literal> と同じです。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:239 +msgid "source" +msgstr "source" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:240 +msgid "" +"<literal>source</literal> causes <command>apt-get</command> to fetch source " +"packages. APT will examine the available packages to decide which source " +"package to fetch. It will then find and download into the current directory " +"the newest available version of that source package. Source packages are " +"tracked separately from binary packages via <literal>deb-src</literal> type " +"lines in the &sources-list; file. This probably will mean that you will not " +"get the same source as the package you have installed or as you could " +"install. If the --compile options is specified then the package will be " +"compiled to a binary .deb using dpkg-buildpackage, if --download-only is " +"specified then the source package will not be unpacked." +msgstr "" +"<literal>source</literal> は、ソースパッケージを取得するのに <command>apt-" +"get</command> します。APT はどのソースパッケージを取得するか決定するよう、利" +"用可能なパッケージを検討します。その後、最新の利用可能なソースパッケージを見" +"つけ、カレントディレクトリへダウンロードします。バイナリパッケージとは別に " +"&sources-list; ファイルの<literal>deb-src</literal> 行から、ソースパッケージ" +"を追跡します。これは、インストールした (またはインストールできる) パッケージ" +"と、取得元を変えることができることを示しています。--compile オプションが指定" +"された場合、dpkg-buildpackage を用いてバイナリ .deb ファイルへコンパイルを行" +"います。--download-only の場合はソースパッケージを展開しません。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:251 +msgid "" +"A specific source version can be retrieved by postfixing the source name " +"with an equals and then the version to fetch, similar to the mechanism used " +"for the package files. This enables exact matching of the source package " +"name and version, implicitly enabling the <literal>APT::Get::Only-Source</" +"literal> option." +msgstr "" +"パッケージと同様に、ソース名の後ろにイコールと取得したいバージョンを置くと、" +"指定したバージョンのソースを取得できます。<literal>APT::Get::Only-Source</" +"literal> オプションが暗黙のうちに有効になっているため、ソースパッケージ名と" +"バージョンに厳密に一致させています。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:257 +msgid "" +"Note that source packages are not tracked like binary packages, they exist " +"only in the current directory and are similar to downloading source tar " +"balls." +msgstr "" +"tar ball はカレントディレクトリにのみダウンロードされ、カレントディレクトリに" +"展開されることに注意してください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:262 +msgid "build-dep" +msgstr "build-dep" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:263 +msgid "" +"<literal>build-dep</literal> causes apt-get to install/remove packages in an " +"attempt to satisfy the build dependencies for a source package." +msgstr "" +"<literal>build-dep</literal> は、ソースパッケージの構築依存関係を満たすよう" +"に、パッケージのインストール・削除を行います。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:267 +msgid "check" +msgstr "check" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:268 +msgid "" +"<literal>check</literal> is a diagnostic tool; it updates the package cache " +"and checks for broken dependencies." +msgstr "" +"<literal>check</literal> は、パッケージキャッシュの更新や壊れた依存関係を" +"チェックする診断ツールです。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:273 +msgid "" +"<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 <filename>&cachedir;/archives/" +"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" +"literal> is run automatically. Those who do not use dselect will likely " +"want to run <literal>apt-get clean</literal> from time to time to free up " +"disk space." +msgstr "" +"<literal>clean</literal> は、取得したパッケージのローカルリポジトリを掃除しま" +"す。<filename>&cachedir;/archives/</filename> と <filename>&cachedir;/" +"archives/partial/</filename> からロックファイル以外すべて削除します。APT が " +"&dselect; から呼ばれるときには、自動的に <literal>clean</literal> が実行され" +"ます。dselectを使用しない場合は、ディスクスペースを解放するため、時々 " +"<literal>apt-get clean</literal> を実行したくなるでしょう。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:282 +msgid "autoclean" +msgstr "autoclean" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:283 +msgid "" +"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 " +"useless. This allows a cache to be maintained over a long period without it " +"growing out of control. The configuration option <literal>APT::Clean-" +"Installed</literal> will prevent installed packages from being erased if it " +"is set to off." +msgstr "" +"<literal>clean</literal> と同様に、<literal>autoclean</literal> は取得した" +"パッケージのローカルリポジトリを掃除します。違いは、もうダウンロードされるこ" +"とがないパッケージファイルや、ほとんど不要なパッケージファイルのみを削除する" +"ことです。このため、長い期間、キャッシュが管理できずに肥大化することなく、維" +"持することができます。設定オプション <literal>APT::Clean-Installed</literal> " +"に off をセットしていれば、インストール済のパッケージファイルが削除されるのを" +"防げます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:292 +msgid "autoremove" +msgstr "autoremove" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:293 +msgid "" +"<literal>autoremove</literal> is used to remove packages that were " +"automatically installed to satisfy dependencies for some package and that " +"are no more needed." +msgstr "" +"<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール" +"され、もう必要なくなったパッケージを削除するのに使用します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:303 apt-get.8.xml:409 +msgid "<option>--no-install-recommends</option>" +msgstr "<option>--no-install-recommends</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:304 +msgid "" +"Do not consider recommended packages as a dependency for installing. " +"Configuration Item: <literal>APT::Install-Recommends</literal>." +msgstr "" +"「推奨」パッケージをインストールする依存関係と見なしません。設定項目 - " +"<literal>APT::Install-Recommends</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:308 +msgid "<option>--download-only</option>" +msgstr "<option>--download-only</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:309 +msgid "" +"Download only; package files are only retrieved, not unpacked or installed. " +"Configuration Item: <literal>APT::Get::Download-Only</literal>." +msgstr "" +"ダウンロードのみ - パッケージファイルの取得のみを行い、展開・インストールを行" +"いません。設定項目 - <literal>APT::Get::Download-Only</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:313 +msgid "<option>--fix-broken</option>" +msgstr "<option>--fix-broken</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:314 +msgid "" +"Fix; attempt to correct a system with broken dependencies in place. This " +"option, when used with install/remove, can omit any packages to permit APT " +"to deduce a likely solution. Any Package that are specified must completely " +"correct the problem. The option is sometimes necessary when running APT for " +"the first time; APT itself does not allow broken package dependencies to " +"exist on a system. It is possible that a system's dependency structure can " +"be so corrupt as to require manual intervention (which usually means using " +"&dselect; or <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." +msgstr "" +"修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や " +"remove と一緒に使うときは、パッケージを指定しなくてもかまいません。どのパッ" +"ケージを指定しても、完全に問題を解決します。APT 自体は、システムに存在する壊" +"れたパッケージ依存関係を許すことができないので、初めて APT を実行する場合、こ" +"のオプションが必要になることがあります。システムの依存関係構造にかなり問題が" +"ある場合は、手動で修正するよう要求することもあります。(通常は、問題のあるパッ" +"ケージを取り除くのに &dselect; や <command>dpkg --remove</command> を使用しま" +"す) このオプションを <option>-m</option> オプションと同時に使用すると、エラー" +"になる状況があるかもしれません。設定項目 - <literal>APT::Get::Fix-Broken</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:327 +msgid "<option>--ignore-missing</option>" +msgstr "<option>--ignore-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:328 +msgid "<option>--fix-missing</option>" +msgstr "<option>--fix-missing</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:329 +msgid "" +"Ignore missing packages; If packages cannot be retrieved or fail the " +"integrity check after retrieval (corrupted package files), hold back those " +"packages and handle the result. Use of this option together with <option>-f</" +"option> may produce an error in some situations. If a package is selected " +"for installation (particularly if it is mentioned on the command line) and " +"it could not be downloaded then it will be silently held back. " +"Configuration Item: <literal>APT::Get::Fix-Missing</literal>." +msgstr "" +"欠落パッケージの無視 - パッケージが取得できなかったり、(パッケージの破損で) " +"取得した後の整合性チェックを通らなかった場合、そのパッケージの処理を保留し最" +"後まで処理を続けます。このオプションを <option>-f</option> オプションと同時に" +"使用すると、エラーになる状況があるかもしれません。パッケージをインストールす" +"るよう選択している場合 (特にコマンドラインでの操作時) や、ダウンロードできな" +"かった場合に、なにも表示せず保留することになります。設定項目 - <literal>APT::" +"Get::Fix-Missing</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:339 +msgid "<option>--no-download</option>" +msgstr "<option>--no-download</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:340 +msgid "" +"Disables downloading of packages. This is best used with <option>--ignore-" +"missing</option> to force APT to use only the .debs it has already " +"downloaded. Configuration Item: <literal>APT::Get::Download</literal>." +msgstr "" +"パッケージのダウンロードを無効にします。これはすでにダウンロードした .deb に" +"対してのみ APT を行う場合に、<option>--ignore-missing</option> と併せて使うの" +"がよいでしょう。設定項目 - <literal>APT::Get::Download</literal>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:347 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Note that quiet level 2 implies <option>-y</option>, you should never " +"use -qq without a no-action modifier such as -d, --print-uris or -s as APT " +"may decided to do something you did not expect. Configuration Item: " +"<literal>quiet</literal>." +msgstr "" +"静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。最大 2 つまで q " +"を重ねることでより静粛にできます。また、<option>-q=#</option> のように静粛レ" +"ベルを指定して、設定ファイルを上書きすることもできます。静粛レベル 2 は " +"<option>-y</option> を含んでいることに注意してください。APT が意図しない決定" +"を行うかもしれないので -d, --print-uris, -s のような操作を行わないオプション" +"をつけずに -qq を使用するべきではありません。設定項目 - <literal>quiet</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:357 +msgid "<option>--simulate</option>" +msgstr "<option>--simulate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:359 +msgid "<option>--dry-run</option>" +msgstr "<option>--dry-run</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:362 +msgid "" +"No action; perform a simulation of events that would occur but do not " +"actually change the system. Configuration Item: <literal>APT::Get::" +"Simulate</literal>." +msgstr "" +"動作なし - なにが起こるのかのシミュレーションを行い、実際にはシステムの変更を" +"行いません。設定項目 - <literal>APT::Get::Simulate</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:366 +msgid "" +"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" +"literal>) automatical. Also a notice will be displayed indicating that this " +"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-" +"Note</literal> is set (Default: true) Neigther NoLocking nor the notice " +"will be triggered if run as root (root should know what he is doing without " +"further warnings by <literal>apt-get</literal>)." +msgstr "" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:372 +msgid "" +"Simulate prints out a series of lines each one representing a dpkg " +"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " +"indicate broken packages with and empty set of square brackets meaning " +"breaks that are of no consequence (rare)." +msgstr "" +"シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、設定 (Conf)、削除 " +"(Remv)、展開 (Inst) を表示します。角カッコは壊れたパッケージを表し、(まれに) " +"空の角カッコは大した問題ではないことを表します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>-y</option>" +msgstr "<option>-y</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>--yes</option>" +msgstr "<option>--yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:380 +msgid "<option>--assume-yes</option>" +msgstr "<option>--assume-yes</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:381 +msgid "" +"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " +"non-interactively. If an undesirable situation, such as changing a held " +"package, trying to install a unauthenticated package or removing an " +"essential package occurs then <literal>apt-get</literal> will abort. " +"Configuration Item: <literal>APT::Get::Assume-Yes</literal>." +msgstr "" +"プロンプトへの自動承諾 - すべてのプロンプトに自動的に \"yes\" と答え、非対話" +"的に実行します。保留したパッケージの状態を変更したり、必須パッケージを削除す" +"るような不適切な状況の場合、<literal>apt-get</literal> は処理を中断します。設" +"定項目 - <literal>APT::Get::Assume-Yes</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:388 +msgid "<option>-u</option>" +msgstr "<option>-u</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:388 +msgid "<option>--show-upgraded</option>" +msgstr "<option>--show-upgraded</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:389 +msgid "" +"Show upgraded packages; Print out a list of all packages that are to be " +"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." +msgstr "" +"更新パッケージ表示 - 更新される全パッケージを一覧表示します。設定項目 - " +"<literal>APT::Get::Show-Upgraded</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:394 +msgid "<option>-V</option>" +msgstr "<option>-V</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:394 +msgid "<option>--verbose-versions</option>" +msgstr "<option>--verbose-versions</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:395 +msgid "" +"Show full versions for upgraded and installed packages. Configuration Item: " +"<literal>APT::Get::Show-Versions</literal>." +msgstr "" +"更新・インストールするパッケージのバージョンをすべて表示します。設定項目 - " +"<literal>APT::Get::Show-Versions</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>-b</option>" +msgstr "<option>-b</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>--compile</option>" +msgstr "<option>--compile</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:400 +msgid "<option>--build</option>" +msgstr "<option>--build</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:401 +msgid "" +"Compile source packages after downloading them. Configuration Item: " +"<literal>APT::Get::Compile</literal>." +msgstr "" +"ソースパッケージをダウンロード後、コンパイルします。設定項目 - <literal>APT::" +"Get::Compile</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:405 +msgid "<option>--install-recommends</option>" +msgstr "<option>--install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:406 +msgid "Also install recommended packages." +msgstr "「推奨」パッケージもインストールします。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:410 +msgid "Do not install recommended packages." +msgstr "「推奨」パッケージをインストールしません。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:413 +msgid "<option>--ignore-hold</option>" +msgstr "<option>--ignore-hold</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:414 +msgid "" +"Ignore package Holds; This causes <command>apt-get</command> to ignore a " +"hold placed on a package. This may be useful in conjunction with " +"<literal>dist-upgrade</literal> to override a large number of undesired " +"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." +msgstr "" +"保留パッケージの無視 - パッケージの保留指示を無視して <command>apt-get</" +"command> を行います。<literal>dist-upgrade</literal> と共に、大量のパッケージ" +"を保留の解除をするのに使用すると便利です。設定項目 - <literal>APT::Ignore-" +"Hold</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:420 +msgid "<option>--no-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:421 +msgid "" +"Do not upgrade packages; When used in conjunction with <literal>install</" +"literal>, <literal>no-upgrade</literal> will prevent packages on the command " +"line from being upgraded if they are already installed. Configuration Item: " +"<literal>APT::Get::Upgrade</literal>." +msgstr "" +"パッケージ更新なし - <literal>install</literal> と同時に使用すると、" +"<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして" +"ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:427 +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:428 +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 " +"not be used except in very special situations. Using <literal>force-yes</" +"literal> can potentially destroy your system! Configuration Item: " +"<literal>APT::Get::force-yes</literal>." +msgstr "" +"強制承諾 - APT が何か損傷を与えかねない動作をしようとした場合でも、確認の入力" +"なしで実行してしまう危険なオプションです。よほどの状況でなければ、使用しない" +"方がいいでしょう。<literal>force-yes</literal> は、あなたのシステムを破壊しか" +"ねません! 設定項目 - <literal>APT::Get::force-yes</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:435 +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:436 +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 " +"hash. Note that the file name to write to will not always match the file " +"name on the remote site! This also works with the <literal>source</literal> " +"and <literal>update</literal> commands. When used with the <literal>update</" +"literal> command the MD5 and size are not included, and it is up to the user " +"to decompress any compressed files. Configuration Item: <literal>APT::Get::" +"Print-URIs</literal>." +msgstr "" +"インストールするファイルを取得する代わりに、その URI を表示します。URI には、" +"パス、対象ファイル名、ファイルサイズ、予測される md5 ハッシュが含まれていま" +"す。出力したファイル名が、常にリモートサイトのファイル名と一致するわけではな" +"い、ということに注意してください! これは <literal>source</literal> コマンド、" +"<literal>update</literal> コマンドでも動作します。<literal>update</literal> " +"で使用したときには、MD5 やファイルサイズを含みません。このとき、圧縮ファイル" +"の展開はユーザの責任において行ってください。設定項目 - <literal>APT::Get::" +"Print-URIs</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:446 +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:447 +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. " +"<option>remove --purge</option> is equivalent for <option>purge</option> " +"command. Configuration Item: <literal>APT::Get::Purge</literal>." +msgstr "" +"削除する際、「削除」ではなく「完全削除」を行います。「完全削除」を行うと指示" +"したパッケージ名の後には、アスタリスク (\"*\") が付きます。<option>remove --" +"purge</option> は <option>purge</option> コマンドと等価です。 設定項目 - " +"<literal>APT::Get::Purge</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +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:455 +msgid "" +"Re-Install packages that are already installed and at the newest version. " +"Configuration Item: <literal>APT::Get::ReInstall</literal>." +msgstr "" +"すでに最新版がインストールされていても、パッケージを再インストールします。設" +"定項目 - <literal>APT::Get::ReInstall</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:459 +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:460 +msgid "" +"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " +"it off. When on <command>apt-get</command> will automatically manage the " +"contents of <filename>&statedir;/lists</filename> to ensure that obsolete " +"files are erased. The only reason to turn it off is if you frequently " +"change your source list. Configuration Item: <literal>APT::Get::List-" +"Cleanup</literal>." +msgstr "" +"この機能はデフォルトで ON になっています。OFF にするには <literal>--no-list-" +"cleanup</literal> としてください。ON の場合、<command>apt-get</command> は古" +"くなったファイルを確実に消去するため、自動的に <filename>&statedir;/lists</" +"filename> の中身を管理します。これを OFF にするのは、取得元リストを頻繁に変更" +"する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:469 +msgid "<option>--target-release</option>" +msgstr "<option>--target-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:470 +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:471 +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 " +"overrides the general settings in <filename>/etc/apt/preferences</" +"filename>. Specifically pinned packages are not affected by the value of " +"this option. In short, this option lets you have simple control over which " +"distribution packages will be retrieved from. Some common examples might be " +"<option>-t '2.1*'</option>, <option>-t unstable</option> or <option>-t sid</" +"option>. Configuration Item: <literal>APT::Default-Release</literal>; see " +"also the &apt-preferences; manual page." +msgstr "" +"このオプションは、ポリシーエンジンへのデフォルト入力を制御します。これは、指" +"定されたリリース文字列を使用し、デフォルト pin を優先度 990 で作成します。" +"<filename>/etc/apt/preferences</filename> にある一般設定を上書きします。pin " +"で留めるのを明示されたパッケージには、このオプションの値は影響を与えません。" +"つまりこのオプションで、どの配布パッケージを取得するかを簡単に管理します。一" +"般的な例としては、<option>-t '2.1*'</option> や <option>-t unstable</" +"option>、<option>-t sid</option> でしょう。設定項目 - <literal>APT::Default-" +"Release</literal>。&apt-preferences; のマニュアルページもご覧ください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:484 +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:486 +msgid "" +"Only perform operations that are 'trivial'. Logically this can be considered " +"related to <option>--assume-yes</option>, where <option>--assume-yes</" +"option> will answer yes to any prompt, <option>--trivial-only</option> will " +"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." +msgstr "" +"「重要でない」操作のみを行います。これは論理的に <option>--assume-yes</" +"option> の仲間と見なせます。<option>--assume-yes</option> は質問にすべて yes " +"と答えますが、<option>--trivial-only</option> はすべて no と答えます。設定項" +"目 - <literal>APT::Get::Trivial-Only</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:492 +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:493 +msgid "" +"If any packages are to be removed apt-get immediately aborts without " +"prompting. Configuration Item: <literal>APT::Get::Remove</literal>." +msgstr "" +"パッケージが削除される状況になったとき、プロンプトを表示せず中断します。設定" +"項目 - <literal>APT::Get::Remove</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:498 +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:499 +msgid "" +"If the command is either <literal>install</literal> or <literal>remove</" +"literal>, then this option acts like running <literal>autoremove</literal> " +"command, removing the unused dependency packages. Configuration Item: " +"<literal>APT::Get::AutomaticRemove</literal>." +msgstr "" +"コマンドが <literal>install</literal> か <literal>remove</literal> である場" +"合、このオプションは使用していないパッケージを削除し、<literal>autoremove</" +"literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:505 +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:506 +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 " +"mapped through the binary table. This means that if this option is " +"specified, these commands will only accept source package names as " +"arguments, rather than accepting binary package names and looking up the " +"corresponding source package. Configuration Item: <literal>APT::Get::Only-" +"Source</literal>." +msgstr "" +"<literal>source</literal> コマンドと <literal>build-dep</literal> コマンドで" +"のみ意味があります。指定されたソース名がバイナリテーブルにマップされないよう" +"にします。これは、このオプションを指定すると、バイナリパッケージ名を受け付け" +"て対応するソースパッケージを探すのではなく、引数にソースパッケージ名しか受け" +"付けなくなる、ということです。設定項目 - <literal>APT::Get::Only-Source</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +msgid "<option>--diff-only</option>" +msgstr "<option>--diff-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +msgid "<option>--dsc-only</option>" +msgstr "<option>--dsc-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +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:517 +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</" +"literal>, and <literal>APT::Get::Tar-Only</literal>." +msgstr "" +"ソースアーカイブの diff ファイルや tar ファイルのダウンロードのみを行います。" +"設定項目 - <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Tar-" +"Only</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:522 +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:523 +msgid "" +"Only process architecture-dependent build-dependencies. Configuration Item: " +"<literal>APT::Get::Arch-Only</literal>." +msgstr "" +"構築依存関係の解決を、アーキテクチャに依存したもののみ行います。設定項目 - " +"<literal>APT::Get::Arch-Only</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:527 +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:528 +#, fuzzy +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::" +"AllowUnauthenticated</literal>." +msgstr "" +"パッケージを確認できない場合に無視し、それについて質問しません。pbuilder のよ" +"うなツールで便利です。設定項目 - <literal>APT::Get::AllowUnauthenticated</" +"literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:546 apt.conf.5.xml:825 +msgid "<filename>/etc/apt/apt.conf</filename>" +msgstr "<filename>/etc/apt/apt.conf</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:547 +msgid "" +"APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" +"literal>." +msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:551 +msgid "<filename>/etc/apt/apt.conf.d/</filename>" +msgstr "<filename>/etc/apt/apt.conf.d/</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:552 +msgid "" +"APT configuration file fragments. Configuration Item: <literal>Dir::Etc::" +"Parts</literal>." +msgstr "APT 設定ファイルの断片。設定項目 - <literal>Dir::Etc::Parts</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:556 +msgid "<filename>/etc/apt/preferences</filename>" +msgstr "<filename>/etc/apt/preferences</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:557 +msgid "" +"Version preferences file. This is where you would specify \"pinning\", i.e. " +"a preference to get certain packages from a separate source or from a " +"different version of a distribution. Configuration Item: <literal>Dir::Etc::" +"Preferences</literal>." +msgstr "" +"バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元" +"や異なるディストリビューションのバージョンの、どこからパッケージを取得するか" +"を設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:565 +msgid "<filename>&cachedir;/archives/</filename>" +msgstr "<filename>&cachedir;/archives/</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:566 +msgid "" +"Storage area for retrieved package files. Configuration Item: <literal>Dir::" +"Cache::Archives</literal>." +msgstr "" +"取得済みパッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::" +"Archives</literal>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:570 +msgid "<filename>&cachedir;/archives/partial/</filename>" +msgstr "<filename>&cachedir;/archives/partial/</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:571 +msgid "" +"Storage area for package files in transit. Configuration Item: " +"<literal>Dir::Cache::Archives</literal> (implicit partial)." +msgstr "" +"取得中パッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::" +"Archives</literal> (必然的に不完全)" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:589 +msgid "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +"preferences;, the APT Howto." +msgstr "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:595 +msgid "" +"<command>apt-get</command> returns zero on normal operation, decimal 100 on " +"error." +msgstr "" +"<command>apt-get</command> は正常終了時に 0 を返します。エラー時には十進の " +"100 を返します。" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:598 +msgid "ORIGINAL AUTHORS" +msgstr "原著者" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:599 +msgid "&apt-author.jgunthorpe;" +msgstr "&apt-author.jgunthorpe;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:602 +msgid "CURRENT AUTHORS" +msgstr "現著者" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:604 +msgid "&apt-author.team;" +msgstr "&apt-author.team;" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-key.8.xml:14 apt-key.8.xml:20 +msgid "apt-key" +msgstr "apt-key" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-key.8.xml:21 +msgid "APT key management utility" +msgstr "APT キー管理ユーティリティ" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-key.8.xml:27 +msgid "" +"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" +msgstr "" +"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:35 +msgid "" +"<command>apt-key</command> is used to manage the list of keys used by apt to " +"authenticate packages. Packages which have been authenticated using these " +"keys will be considered trusted." +msgstr "" +"<command>apt-key</command> は、apt が パッケージを認証するのに使用するキーの" +"一覧を管理するのに使用します。このキーで認証されたパッケージは、信頼するに足" +"ると見なせるでしょう。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-key.8.xml:41 +msgid "Commands" +msgstr "コマンド" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:43 +msgid "add <replaceable>filename</replaceable>" +msgstr "add <replaceable>filename</replaceable>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:47 +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>." +msgstr "" +"信頼キー一覧に新しいキーを追加します。このキーは <replaceable>filename</" +"replaceable> から読み込みますが、<replaceable>filename</replaceable> を " +"<literal>-</literal> とすると、標準入力から読み込みます。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:55 +msgid "del <replaceable>keyid</replaceable>" +msgstr "del <replaceable>keyid</replaceable>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:59 +msgid "Remove a key from the list of trusted keys." +msgstr "信頼キー一覧からキーを削除します。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:66 +msgid "export <replaceable>keyid</replaceable>" +msgstr "export <replaceable>keyid</replaceable>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:70 +msgid "Output the key <replaceable>keyid</replaceable> to standard output." +msgstr "キー <replaceable>keyid</replaceable> を標準出力に出力します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:77 +msgid "exportall" +msgstr "exportall" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:81 +msgid "Output all trusted keys to standard output." +msgstr "信頼するキーをすべて標準出力に出力します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:88 +msgid "list" +msgstr "list" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:92 +msgid "List trusted keys." +msgstr "信頼キーを一覧表示します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:99 +msgid "finger" +msgstr "finger" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:103 +msgid "List fingerprints of trusted keys." +msgstr "信頼キーのフィンガープリントを一覧表示します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:110 +msgid "adv" +msgstr "adv" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:114 +msgid "" +"Pass advanced options to gpg. With adv --recv-key you can download the " +"public key." +msgstr "" +"gpg に上級オプションを渡します。adv --recv-key とすると、公開鍵をダウンロード" +"できます。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:126 +msgid "" +"Update the local keyring with the keyring of Debian archive keys and removes " +"from the keyring the archive keys which are no longer valid." +msgstr "" +"Debian アーカイブキーで、ローカルキーリングを更新し、もう有効でないキーをキー" +"リングから削除します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:139 +msgid "<filename>/etc/apt/trusted.gpg</filename>" +msgstr "<filename>/etc/apt/trusted.gpg</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:140 +msgid "Keyring of local trusted keys, new keys will be added here." +msgstr "ローカル信頼キーのキーリング。新しいキーはここに追加されます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:143 +msgid "<filename>/etc/apt/trustdb.gpg</filename>" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +msgid "Local trust database of archive keys." +msgstr "アーカイブキーのローカル信頼データベースです。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:147 +msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:148 +msgid "Keyring of Debian archive trusted keys." +msgstr "Debian アーカイブ信頼キーのキーリングです。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:151 +msgid "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:152 +msgid "Keyring of Debian archive removed trusted keys." +msgstr "削除された Debian アーカイブ信頼キーのキーリングです。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:163 +msgid "&apt-get;, &apt-secure;" +msgstr "&apt-get;, &apt-secure;" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-mark.8.xml:13 +msgid "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " +"November 2007</date>" +msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " +"November 2007</date>" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-mark.8.xml:22 apt-mark.8.xml:28 +msgid "apt-mark" +msgstr "apt-mark" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-mark.8.xml:29 +msgid "mark/unmark a package as being automatically-installed" +msgstr "パッケージが自動的にインストールされたかどうかのマークを変更します。" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-mark.8.xml:35 +msgid "" +"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req" +"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>package</replaceable></arg>" +msgstr "" +"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req" +"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>package</replaceable></arg>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:44 +msgid "" +"<command>apt-mark</command> will change whether a package has been marked as " +"being automatically installed." +msgstr "" +"<command>apt-mark</command> は、パッケージが自動的にインストールされたかどう" +"かのマークを変更します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:48 +msgid "" +"When you request that a package is installed, and as a result other packages " +"are installed to satisfy its dependencies, the dependencies are marked as " +"being automatically installed. Once these automatically installed packages " +"are no longer depended on by any manually installed packages, they will be " +"removed." +msgstr "" +"パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満" +"たすためにインストールされた場合、依存関係に自動的にインストールしたとマーク" +"します。いったん自動的にインストールされたパッケージは、手動でインストールし" +"たパッケージに依存されなくなると、そのパッケージは削除されます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:55 +msgid "markauto" +msgstr "markauto" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:56 +msgid "" +"<literal>markauto</literal> is used to mark a package as being automatically " +"installed, which will cause the package to be removed when no more manually " +"installed packages depend on this package." +msgstr "" +"<literal>markauto</literal> は、パッケージを自動的にインストールしたとして" +"マークします。このパッケージに依存する、手動でインストールされたパッケージが" +"なくなると、このパッケージを削除します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:63 +msgid "unmarkauto" +msgstr "unmarkauto" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:64 +msgid "" +"<literal>unmarkauto</literal> is used to mark a package as being manually " +"installed, which will prevent the package from being automatically removed " +"if no other packages depend on it." +msgstr "" +"<literal>unmarkauto</literal> は、パッケージを手動でインストールしたとして" +"マークします。このパッケージに依存する他のパッケージがなくなっても、このパッ" +"ケージを自動的に削除するのを防ぎます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:76 +msgid "<option>-f=<filename>FILENAME</filename></option>" +msgstr "<option>-f=<filename>FILENAME</filename></option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:76 +msgid "<option>--file=<filename>FILENAME</filename></option>" +msgstr "<option>--file=<filename>FILENAME</filename></option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:79 +msgid "" +"Read/Write package stats from <filename>FILENAME</filename> instead of the " +"default location, which is <filename>extended_status</filename> in the " +"directory defined by the Configuration Item: <literal>Dir::State</literal>." +msgstr "" +"デフォルトの場所 (設定項目: <literal>Dir::State</literal> で定義したディレク" +"トリの <filename>extended_status</filename>) に代えて、<filename>FILENAME</" +"filename> からパッケージの統計を読み書きします。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:85 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:86 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:87 +msgid "Show a short usage summary." +msgstr "短い使用方法を表示します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:93 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:94 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:95 +msgid "Show the program version." +msgstr "プログラムのバージョン情報を表示します" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:109 +msgid "" +"<command>apt-mark</command> returns zero on normal operation, non-zero on " +"error." +msgstr "" +"<command>apt-mark</command> は正常終了時に 0 を返します。エラー時には十進の " +"100 を返します。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-secure.8.xml:14 apt-secure.8.xml:35 +msgid "apt-secure" +msgstr "apt-secure" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-secure.8.xml:36 +msgid "Archive authentication support for APT" +msgstr "APT アーカイブ認証サポート" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:41 +msgid "" +"Starting with version 0.6, <command>apt</command> contains code that does " +"signature checking of the Release file for all archives. This ensures that " +"packages in the archive can't be modified by people who have no access to " +"the Release file signing key." +msgstr "" +"バージョン 0.6 より、<command>apt</command> 全アーカイブに対する Release ファ" +"イルの署名チェックコードが含まれています。Release ファイル署名キーにアクセス" +"できない人が、アーカイブのパッケージの変更が確実にできないようにします。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:49 +msgid "" +"If a package comes from a archive without a signature or with a signature " +"that apt does not have a key for that package is considered untrusted and " +"installing it will result in a big warning. <command>apt-get</command> will " +"currently only warn for unsigned archives, future releases might force all " +"sources to be verified before downloading packages from them." +msgstr "" +"パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、アー" +"カイブから来たパッケージは、信頼されていないと見なし、インストールの際に重要" +"な警告が表示されます。 <command>apt-get</command> は、現在未署名のパッケージ" +"に対して警告するだけですが、将来のリリースでは全ソースに対し、パッケージダウ" +"ンロード前に強制的に検証される可能性があります。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:58 +msgid "" +"The package frontends &apt-get;, &aptitude; and &synaptic; support this new " +"authentication feature." +msgstr "" +"&apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、この新" +"認証機能をサポートしています。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:63 +msgid "Trusted archives" +msgstr "信頼済アーカイブ" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:66 +msgid "" +"The chain of trust from an apt archive to the end user is made up of " +"different steps. <command>apt-secure</command> is the last step in this " +"chain, trusting an archive does not mean that the packages that you trust it " +"do not contain malicious code but means that you trust the archive " +"maintainer. Its the archive maintainer responsibility to ensure that the " +"archive integrity is correct." +msgstr "" +"apt アーカイブからエンドユーザまでの信頼の輪は、いくつかのステップで構成され" +"ています。<command>apt-secure</command> は、この輪の最後のステップで、アーカ" +"イブを信頼することは、パッケージに悪意のあるコードが含まれていないと信頼する" +"わけではありませんが、アーカイブメンテナを信頼すると言うことです。これは、" +"アーカイブの完全性を保証するのは、アーカイブメンテナの責任だということです。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:74 +msgid "" +"apt-secure does not review signatures at a package level. If you require " +"tools to do this you should look at <command>debsig-verify</command> and " +"<command>debsign</command> (provided in the debsig-verify and devscripts " +"packages respectively)." +msgstr "" +"apt-secure はパッケージレベルの署名検証は行いません。そのようなツールが必要な" +"場合は、<command>debsig-verify</command> や <command>debsign</command> " +"(debsig-verify パッケージと devscripts パッケージでそれぞれ提供されています) " +"を確認してください。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:81 +msgid "" +"The chain of trust in Debian starts when a maintainer uploads a new package " +"or a new version of a package to the Debian archive. This upload in order to " +"become effective needs to be signed by a key of a maintainer within the " +"Debian maintainer's keyring (available in the debian-keyring package). " +"Maintainer's keys are signed by other maintainers following pre-established " +"procedures to ensure the identity of the key holder." +msgstr "" +"Debian における信頼の輪は、新しいパッケージやパッケージの新しいバージョンを、" +"メンテナが Debian アーカイブにアップロードすることで始まります。これは、" +"Debian メンテナキーリング (debian-keyring パッケージにあります) にあるメンテ" +"ナのキーで署名しなければ、アップロードできないということです。メンテナのキー" +"は、キーの所有者のアイデンティティを確保するため、以下のような事前に確立した" +"手段で、他のメンテナに署名されています。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:91 +msgid "" +"Once the uploaded package is verified and included in the archive, the " +"maintainer signature is stripped off, an MD5 sum of the package is computed " +"and put in the Packages file. The MD5 sum of all of the packages files are " +"then computed and put into the Release file. The Release file is then signed " +"by the archive key (which is created once a year and distributed through the " +"FTP server. This key is also on the Debian keyring." +msgstr "" +"アップロードされたパッケージごとに、検証してアーカイブに格納します。パッケー" +"ジは、メンテナの署名をはがされ、MD5 sum を計算されて、Packages ファイルに格納" +"されます。その後、全パッケージファイルの MD5 sum を計算してから、Release ファ" +"イルに置きます。Release ファイルは、アーカイブキーで署名されます。アーカイブ" +"キーは年ごとに作成され、FTP サーバで配布されます。このキーも Debian キーリン" +"グに含まれます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:101 +msgid "" +"Any end user can check the signature of the Release file, extract the MD5 " +"sum of a package from it and compare it with the MD5 sum of the package he " +"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian " +"package was checked. Now both the MD5 sum and the signature of the Release " +"file are checked." +msgstr "" +"エンドユーザは誰でも、Release ファイルの署名をチェックし、パッケージの MD5 " +"sum を抽出して、ダウンロードしたパッケージの MD5 sum と比較できます。バージョ" +"ン 0.6 以前では、ダウンロードした Debian パッケージの MD5 sum しか、チェック" +"していませんでした。現在では、MD5 sum と Release ファイルの署名の両方でチェッ" +"クします。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:108 +msgid "" +"Notice that this is distinct from checking signatures on a per package " +"basis. It is designed to prevent two possible attacks:" +msgstr "" +"以上は、パッケージごとの署名チェックとは違うことに注意してください。以下のよ" +"うに考えられる 2 種類の攻撃を防ぐよう設計されています。" + +# type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:113 +msgid "" +"<literal>Network \"man in the middle\" attacks</literal>. Without signature " +"checking, a malicious agent can introduce himself in the package download " +"process and provide malicious software either by controlling a network " +"element (router, switch, etc.) or by redirecting traffic to a rogue server " +"(through arp or DNS spoofing attacks)." +msgstr "" +"<literal>ネットワーク中間者攻撃</literal> 署名をチェックしないと、悪意ある" +"エージェントがパッケージダウンロードプロセスに割り込んだり、ネットワーク構成" +"要素 (ルータ、スイッチなど) の制御や、悪漢サーバへのネットワークトラフィック" +"のリダイレクトなど (arp スプーフィング攻撃や DNS スプーフィング攻撃) で、悪意" +"あるソフトウェアを掴まされたりします。" + +# type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:121 +msgid "" +"<literal>Mirror network compromise</literal>. Without signature checking, a " +"malicious agent can compromise a mirror host and modify the files in it to " +"propagate malicious software to all users downloading packages from that " +"host." +msgstr "" +"<literal>ミラーネットワーク感染</literal>。署名をチェックしないと、悪意ある" +"エージェントがミラーホストに感染し、このホストからダウンロードしたユーザすべ" +"てに、悪意あるソフトウェアが伝播するようにファイルを変更できます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:128 +msgid "" +"However, it does not defend against a compromise of the Debian master server " +"itself (which signs the packages) or against a compromise of the key used to " +"sign the Release files. In any case, this mechanism can complement a per-" +"package signature." +msgstr "" +"しかしこれは、(パッケージに署名する) Debian マスターサーバ自体の侵害や、" +"Release ファイルに署名するのに使用したキーの漏洩を防げません。いずれにせよ、" +"この機構はパッケージごとの署名を補完することができます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:134 +msgid "User configuration" +msgstr "ユーザの設定" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:136 +msgid "" +"<command>apt-key</command> is the program that manages the list of keys used " +"by apt. It can be used to add or remove keys although an installation of " +"this release will automatically provide the default Debian archive signing " +"keys used in the Debian package repositories." +msgstr "" +"<command>apt-key</command> は、apt が使用するキーリストを管理するプログラムで" +"す。このリリースのインストールでは、Debian パッケージリポジトリで使用する、" +"キーで署名するデフォルトの Debian アーカイブを提供しますが、<command>apt-" +"key</command> でキーの追加・削除が行えます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:143 +msgid "" +"In order to add a new key you need to first download it (you should make " +"sure you are using a trusted communication channel when retrieving it), add " +"it with <command>apt-key</command> and then run <command>apt-get update</" +"command> so that apt can download and verify the <filename>Release.gpg</" +"filename> files from the archives you have configured." +msgstr "" +"新しいキーを追加するためには、まずキーをダウンロードする必要があります。(取得" +"する際には、信頼できる通信チャネルを使用するよう、特に留意してください) 取得" +"したキーを、<command>apt-key</command> で追加し、<command>apt-get update</" +"command> を実行してください。以上により、apt は指定したアーカイブから、" +"<filename>Release.gpg</filename> ファイルをダウンロード・検証できるようになり" +"ます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:152 +msgid "Archive configuration" +msgstr "アーカイブの設定" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:154 +msgid "" +"If you want to provide archive signatures in an archive under your " +"maintenance you have to:" +msgstr "" +"あなたがメンテナンスしているアーカイブで、アーカイブ署名を提供したい場合、以" +"下のようにしてください。" + +# type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:159 +msgid "" +"<literal>Create a toplevel Release file</literal>. if it does not exist " +"already. You can do this by running <command>apt-ftparchive release</" +"command> (provided in apt-utils)." +msgstr "" +"<literal>最上位 Release ファイルの作成</literal>。既にこれが存在しているので" +"なければ、<command>apt-ftparchive release</command> (apt-utils で提供) を実行" +"して作成してください。" + +# type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:164 +msgid "" +"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o " +"Release.gpg Release</command>." +msgstr "" +"<literal>署名</literal>します。<command>gpg -abs -o Release.gpg Release</" +"command> を実行して、署名してください。" + +# type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:167 +msgid "" +"<literal>Publish the key fingerprint</literal>, that way your users will " +"know what key they need to import in order to authenticate the files in the " +"archive." +msgstr "" +"<literal>キーの指紋を配布</literal> これにより、アーカイブ内のファイル認証" +"に、どのキーをインポートする必要があるかを、ユーザに知らせることになります。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:174 +msgid "" +"Whenever the contents of the archive changes (new packages are added or " +"removed) the archive maintainer has to follow the first two steps previously " +"outlined." +msgstr "" +"アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、アーカイブメ" +"ンテナは前述の最初の 1, 2 ステップに従わなければなりません。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:182 +msgid "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" +msgstr "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:186 +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." +msgstr "" +"詳細な背景情報を検証するのなら、Securing Debian Manual (harden-doc パッケージ" +"にも収録) の <ulink url=\"http://www.debian.org/doc/manuals/securing-debian-" +"howto/ch7.en.html\">Debian Security Infrastructure</ulink> 章や、V. Alex " +"Brennen による <ulink url=\"http://www.cryptnet.net/fdp/crypto/strong_distro." +"html\" >Strong Distribution HOWTO</ulink> をご覧ください。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:199 +msgid "Manpage Authors" +msgstr "マニュアルページ作者" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:201 +msgid "" +"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgstr "" +"このマニュアルページは Javier Fernández-Sanguino Peña, Isaac Jones, Colin " +"Walters, Florian Weimer, Michael Vogt の作業を元にしています。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:28 +msgid "apt-sortpkgs" +msgstr "apt-sortpkgs" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-sortpkgs.1.xml:29 +msgid "Utility to sort package index files" +msgstr "パッケージインデックスファイルのソートユーティリティ" + +# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-sortpkgs.1.xml:35 +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>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:44 +msgid "" +"<command>apt-sortpkgs</command> will take an index file (Source index or " +"Package index) and sort the records so that they are ordered by the package " +"name. It will also sort the internal fields of each record according to the " +"internal sorting rules." +msgstr "" +"<command>apt-sortpkgs</command> は、インデックスファイル (ソースインデックス" +"やパッケージインデックス) からレコードをソートし、パッケージ名順に整えます。" +"また、内部のソート規則に従って、内部フィールドについてもソートを行います。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:50 +msgid "All output is sent to stdout, the input must be a seekable file." +msgstr "" +"出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-sortpkgs.1.xml:57 +msgid "<option>--source</option>" +msgstr "<option>--source</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-sortpkgs.1.xml:59 +msgid "" +"Use Source index field ordering. Configuration Item: <literal>APT::" +"SortPkgs::Source</literal>." +msgstr "" +"ソースインデックスフィールド順に並べ替えに使用します。設定項目 - " +"<literal>APT::SortPkgs::Source</literal>." + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:73 +msgid "" +"<command>apt-sortpkgs</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-sortpkgs</command> は正常終了時に 0 を返します。エラー時には十進" +"の 100 を返します。" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt.conf.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>10 December 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>10 December 2008</date>" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt.conf.5.xml:28 apt.conf.5.xml:34 +msgid "apt.conf" +msgstr "apt.conf" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 +msgid "5" +msgstr "5" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt.conf.5.xml:35 +msgid "Configuration file for APT" +msgstr "APT の設定ファイル" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:39 +msgid "" +"<filename>apt.conf</filename> is the main configuration file for the APT " +"suite of tools, all tools make use of the configuration file and a common " +"command line parser to provide a uniform environment. When an APT tool " +"starts up it will read the configuration specified by the <envar>APT_CONFIG</" +"envar> environment variable (if any) and then read the files in " +"<literal>Dir::Etc::Parts</literal> then read the main configuration file " +"specified by <literal>Dir::Etc::main</literal> then finally apply the " +"command line options to override the configuration directives, possibly " +"loading even more config files." +msgstr "" +"<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。この" +"設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環境で" +"使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指" +"定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::Parts</" +"literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</literal> で" +"指定した主設定ファイルを読み込み、最後にコマンドラインオプションで、設定ファ" +"イルより取得した値を上書きします。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:49 +msgid "" +"The configuration file is organized in a tree with options organized into " +"functional groups. option specification is given with a double colon " +"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option " +"within the APT tool group, for the Get tool. options do not inherit from " +"their parent groups." +msgstr "" +"設定ファイルは、機能グループごとに系統立てられたオプションを木構造で表しま" +"す。オプションの内容は、2 つのコロンで区切ります。例えば <literal>APT::Get::" +"Assume-Yes</literal> は、APT ツールグループの Get ツール用オプションです。オ" +"プションは、親グループから継承しません。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:55 +msgid "" +"Syntactically the configuration language is modeled after what the ISC tools " +"such as bind and dhcp use. Lines starting with <literal>//</literal> are " +"treated as comments (ignored), as well as all text between <literal>/*</" +"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is " +"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing " +"semicolon is required and the quotes are optional. A new scope can be opened " +"with curly braces, like:" +msgstr "" +"設定言語の文法は、bind や dhcp のような ISC ツールをモデルにしています。" +"<literal>//</literal> で始まる行はコメントとして扱われます (無視)。同様に C/C" +"++ のコメントのような <literal>/*</literal> と <literal>*/</literal> の間もコ" +"メントとして扱います。いずれの行も、<literallayout>APT::Get::Assume-Yes " +"\"true\";</literallayout> のような形式です。行末のセミコロンは必要ですが、ダ" +"ブルクォートは使わなくてもかまいません。以下のように中カッコを使うと、新しい" +"スコープを開くことができます。" + +# type: Content of: <refentry><refsect1><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:65 +#, no-wrap +msgid "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" +msgstr "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:73 +msgid "" +"with newlines placed to make it more readable. Lists can be created by " +"opening a scope and including a single string enclosed in quotes followed by " +"a semicolon. Multiple entries can be included, each separated by a semicolon." +msgstr "" +"また適宜改行することで、より読みやすくなります。リストは、開いたスコープ、" +"クォートで囲まれた 1 単語、そしてセミコロンと続けることで作成できます。セミコ" +"ロンで区切ると、複数のエントリを表せます。" + +# type: Content of: <refentry><refsect1><informalexample><programlisting> +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:78 +#, no-wrap +msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:81 +msgid "" +"In general the sample configuration file in <filename>&docdir;examples/apt." +"conf</filename> &configureindex; is a good guide for how it should look." +msgstr "" +"<filename>&docdir;examples/apt.conf</filename> &configureindex; は一般的な設" +"定ファイルのサンプルです。どのように設定するか参考になるでしょう。" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:85 +msgid "" +"The names of the configuration items are not case-sensitive. So in the " +"previous example you could use <literal>dpkg::pre-install-pkgs</literal>." +msgstr "" +"設定項目の名前は、文字の大小を区別しません。そのため、前述の例を " +"<literal>dpkg::pre-install-pkgs</literal> とできます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:88 +msgid "" +"Two specials are allowed, <literal>#include</literal> and <literal>#clear</" +"literal> <literal>#include</literal> will include the given file, unless the " +"filename ends in a slash, then the whole directory is included. " +"<literal>#clear</literal> is used to erase a part of the configuration tree. " +"The specified element and all its descendents are erased." +msgstr "" +"<literal>#include</literal> と <literal>#clear</literal> の 2 つの特別な記法" +"があります。<literal>#include</literal> は指定したファイルを取り込みます。" +"ファイル名がスラッシュで終わった場合には、そのディレクトリをすべて取り込みま" +"す。<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。" +"指定した要素と、それ以下の要素を削除します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 +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." +msgstr "" +"すべての APT ツールで、コマンドラインで任意の設定を行う -o オプションが使用で" +"きます。文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</" +"literal>)、等号、続いてオプションの新しい値となります。リスト名に続き::を加え" +"ることで、リストを追加することができます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:101 +msgid "The APT Group" +msgstr "APT グループ" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:102 +msgid "" +"This group of options controls general APT behavior as well as holding the " +"options for all of the tools." +msgstr "" +"このオプショングループは、ツール全体に影響のある、一般的な APT の振る舞いを制" +"御します。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:106 +msgid "Architecture" +msgstr "Architecture" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:107 +msgid "" +"System Architecture; sets the architecture to use when fetching files and " +"parsing package lists. The internal default is the architecture apt was " +"compiled for." +msgstr "" +"システムアーキテクチャ - ファイルを取得したり、パッケージリストを解析するとき" +"に使用するアーキテクチャをセットします。内部でのデフォルトは、apt をコンパイ" +"ルしたアーキテクチャです。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:112 +msgid "Default-Release" +msgstr "Default-Release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:113 +msgid "" +"Default release to install packages from if more than one version available. " +"Contains release name, codename or release version. Examples: 'stable', " +"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-" +"preferences;." +msgstr "" +"ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト" +"リリースです。リリース名や、コード名、リリースバージョンです。例えば " +"stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*' となりま" +"す。 &apt-preferences; も参照してください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:117 +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:118 +msgid "" +"Ignore Held packages; This global option causes the problem resolver to " +"ignore held packages in its decision making." +msgstr "" +"保留パッケージの無視 - このグローバルオプションは、問題解決器に保留と指定した" +"パッケージを無視します。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:122 +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:123 +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 " +"then packages that are locally installed are also excluded from cleaning - " +"but note that APT provides no direct means to reinstall them." +msgstr "" +"デフォルトで有効です。autoclean 機能が on の時、ダウンロードできなくなった" +"パッケージをキャッシュから削除します。off の場合、ローカルにインストールされ" +"ているパッケージは、削除対象から外します。しかし、 APT はキャッシュから削除し" +"たパッケージの再インストール方法を、直接提供するわけではないことに注意してく" +"ださい。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:129 +msgid "Immediate-Configure" +msgstr "Immediate-Configure" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:130 +msgid "" +"Disable Immediate Configuration; This dangerous option disables some of " +"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " +"necessary on some extremely slow single user systems but is very dangerous " +"and may cause package install scripts to fail or worse. Use at your own " +"risk." +msgstr "" +"即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg の呼" +"び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシステム" +"では必要かもしれませんが、非常に危険で、パッケージのインストールスクリプトが" +"失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任で使用して" +"ください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:137 +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:138 +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/" +"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH " +"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the " +"essential packages are not tar, gzip, libc, dpkg, bash or anything that " +"those packages depend on." +msgstr "" +"何をしようとしているのか「本当に」判っているのでなければ、絶対にこのオプショ" +"ンを有効にしないでください。不可欠 (essential) パッケージ同士で、競合 " +"(Conflicts) /競合や競合/事前依存 (Pre-Depend) のループに落ち込んだときに、不" +"可欠パッケージを一時的に削除してループを抜けられるようにします。<emphasis>そ" +"んなループはあり得ないはずで、あるとすれば重大なバグです。</emphasis>このオプ" +"ションは、tar, gzip, libc, dpkg, bash とそれらが依存しているパッケージ以外の" +"不可欠パッケージで動作します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:146 +msgid "Cache-Limit" +msgstr "Cache-Limit" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:147 +msgid "" +"APT uses a fixed size memory mapped cache file to store the 'available' " +"information. This sets the size of that cache (in bytes)." +msgstr "" +"APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ" +"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:151 +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:152 +msgid "Defines which package(s) are considered essential build dependencies." +msgstr "構築依存関係で不可欠なパッケージを定義します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:155 +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:156 +msgid "" +"The Get subsection controls the &apt-get; tool, please see its documentation " +"for more information about the options here." +msgstr "" +"Get サブセクションは &apt-get; ツールを制御します。このオプションの詳細は " +"&apt-get; の文書を参照してください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:160 +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:161 +msgid "" +"The Cache subsection controls the &apt-cache; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"Cache サブセクションは &apt-cache; ツールを制御します。このオプションの詳細" +"は &apt-cache; の文書を参照してください。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:165 +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:166 +msgid "" +"The CDROM subsection controls the &apt-cdrom; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"CDROM サブセクションは &apt-cdrom; ツールを制御します。このオプションの詳細" +"は &apt-cdrom; の文書を参照してください。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:172 +msgid "The Acquire Group" +msgstr "Acquire グループ" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:177 +msgid "PDiffs" +msgstr "PDiffs" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:178 +msgid "" +"Try to download deltas called <literal>PDiffs</literal> for Packages or " +"Sources files instead of downloading whole ones. True by default." +msgstr "" +"Packages ファイルや Sources ファイルの全体をダウンロードするのではなく、" +"<literal>PDiffs</literal> と呼ばれる差分をダウンロードしようとします。デフォ" +"ルトでは True です。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:183 +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:184 +msgid "" +"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" +"literal> or <literal>access</literal> which determines how APT parallelizes " +"outgoing connections. <literal>host</literal> means that one connection per " +"target host will be opened, <literal>access</literal> means that one " +"connection per URI type will be opened." +msgstr "" +"キューモード - <literal>Queue-Mode</literal> は、APT がどのように並列接続を行" +"うか、<literal>host</literal> か <literal>access</literal> で指定できます。" +"<literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。" +"<literal>access</literal> は、URI タイプごとに 1 接続を開きます。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:191 +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:192 +msgid "" +"Number of retries to perform. If this is non-zero APT will retry failed " +"files the given number of times." +msgstr "" +"リトライの回数を設定します。0 でない場合、APT は失敗したファイルに対して、与" +"えられた回数だけリトライを行います。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:196 +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:197 +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 "" +"ソースアーカイブのシンボリックリンクを使用します。true がセットされていると" +"き、可能ならコピーの代わりにシンボリックリンクを張ります。true がデフォルトで" +"す。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:201 sources.list.5.xml:138 +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:202 +msgid "" +"HTTP URIs; http::Proxy is the default http proxy to use. It is in the " +"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " +"host proxies can also be specified by using the form <literal>http::Proxy::" +"<host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. The <envar>http_proxy</envar> environment " +"variable will override all settings." +msgstr "" +"HTTP URI - http::Proxy は、デフォルトで使用する http プロキシです。" +"<literal>http://[[user][:pass]@]host[:port]/</literal> という標準形で表しま" +"す。ホストごとのプロキシの場合は、<literal>http::Proxy::<host></" +"literal> という形と、プロキシを使用しないという意味の特殊キーワード " +"<literal>DIRECT</literal> を使用して指定することもできます。すべての設定は、" +"環境変数 <envar>http_proxy</envar> で上書きされます。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:209 +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 " +"response under any circumstances, <literal>Max-Age</literal> is sent only " +"for index files and tells the cache to refresh its object if it is older " +"than the given number of seconds. Debian updates its index files daily so " +"the default is 1 day. <literal>No-Store</literal> specifies that the cache " +"should never store this request, it is only set for archive files. This may " +"be useful to prevent polluting a proxy cache with very large .deb files. " +"Note: Squid 2.0.2 does not support any of these options." +msgstr "" +"HTTP/1.1 準拠のプロキシキャッシュの制御について 3 種類の設定があります。" +"<literal>No-Cache</literal> はプロキシに対して、いかなる時もキャッシュを使用" +"しないと伝えます。<literal>Max-Age</literal> は、インデックスファイル用のとき" +"だけ送信し、得られた時間よりも古かった場合に、オブジェクトをリフレッシュする" +"ようキャッシュに指示します。デフォルトでは 1 日となっているため、Debian は日" +"毎にそのインデックスファイルを更新します。<literal>No-Store</literal> は、" +"キャッシュがこのリクエストを格納せず、アーカイブファイルのみ設定するよう指定" +"します。これは、非常に大きな .deb ファイルで、プロキシキャッシュが汚れるのを" +"防ぐのに便利かもしれません。注) Squid 2.0.2 では、これらのオプションをサポー" +"トしていません。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:219 apt.conf.5.xml:267 +msgid "" +"The option <literal>timeout</literal> sets the timeout timer used by the " +"method, this applies to all things including connection timeout and data " +"timeout." +msgstr "" +"<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時間を" +"設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま" +"す。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:222 +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: <tag></tag> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:231 +msgid "https" +msgstr "https" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:232 +msgid "" +"HTTPS URIs. Cache-control and proxy options are the same as for " +"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"not supported yet." +msgstr "" +"HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ" +"ソッドと同様です。<literal>Pipeline-Depth</literal> オプションはまだサポート" +"していません。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +msgid "" +"<literal>CaInfo</literal> suboption specifies place of file that holds info " +"about trusted certificates. <literal><host>::CaInfo</literal> is " +"corresponding per-host option. <literal>Verify-Peer</literal> boolean " +"suboption determines whether verify server's host certificate against " +"trusted certificates or not. <literal><host>::Verify-Peer</literal> " +"is corresponding per-host option. <literal>Verify-Host</literal> boolean " +"suboption determines whether verify server's hostname or not. <literal><" +"host>::Verify-Host</literal> is corresponding per-host option. " +"<literal>SslCert</literal> determines what certificate to use for client " +"authentication. <literal><host>::SslCert</literal> is corresponding " +"per-host option. <literal>SslKey</literal> determines what private key to " +"use for client authentication. <literal><host>::SslKey</literal> is " +"corresponding per-host option. <literal>SslForceVersion</literal> overrides " +"default SSL version to use. Can contain 'TLSv1' or 'SSLv3' string. " +"<literal><host>::SslForceVersion</literal> is corresponding per-host " +"option." +msgstr "" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:254 sources.list.5.xml:149 +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:255 +msgid "" +"FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " +"standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and " +"is overridden by the <envar>ftp_proxy</envar> environment variable. To use a " +"ftp proxy you will have to set the <literal>ftp::ProxyLogin</literal> script " +"in the configuration file. This entry specifies the commands to send to tell " +"the proxy server what to connect to. Please see &configureindex; for an " +"example of how to do this. The substitution variables available are <literal>" +"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>" +"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</" +"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's " +"respective URI component." +msgstr "" +"FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。" +"<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表します" +"が、環境変数 <envar>ftp_proxy</envar> で上書きされます。ftp プロキシを使用す" +"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す" +"る必要があります。接続する際にプロキシサーバに送信するコマンドをこのエントリ" +"に設定します。どのようにするのかは &configureindex; の例を参照してください。" +"その他にも、<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</" +"literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> " +"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> が利用可能で" +"す。いずれも、それぞれ URI を構成するトークンです。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:270 +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 " +"some situations require that passive mode be disabled and port mode ftp used " +"instead. This can be done globally, for connections that go through a proxy " +"or for a specific host (See the sample config file for examples)." +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:277 +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 " +"method above for syntax. You cannot set this in the configuration file and " +"it is not recommended to use FTP over HTTP due to its low efficiency." +msgstr "" +"環境変数 <envar>ftp_proxy</envar> の http url により FTP over HTTP のプロキシ" +"が利用可能になります。文法は上の http についての説明を参照してください。設定" +"ファイルの中でこれをセットすることはできません。また、効率が悪いため FTP " +"over 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:282 +msgid "" +"The setting <literal>ForceExtended</literal> controls the use of RFC2428 " +"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " +"false, which means these commands are only used if the control connection is " +"IPv6. Setting this to true forces their use even on IPv4 connections. Note " +"that most FTP servers do not support RFC2428." +msgstr "" +"<literal>ForceExtended</literal> の設定は RFC2428 の <literal>EPSV</literal> " +"コマンドと <literal>EPRT</literal> コマンドの使用を制御します。デフォルトで" +"は false で、コントロールコネクションが IPv6 の時にのみ、このコマンドを使用す" +"るということです。これを true にセットすると、IPv4 コネクションでも、強制的に" +"このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな" +"いことに注意してください。" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:289 sources.list.5.xml:131 +msgid "cdrom" +msgstr "cdrom" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:295 +#, 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:290 +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 " +"drive as specified in <filename>/etc/fstab</filename>. It is possible to " +"provide alternate mount and unmount commands if your mount point cannot be " +"listed in the fstab (such as an SMB mount and old mount packages). The " +"syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the " +"cdrom block. It is important to have the trailing slash. Unmount commands " +"can be specified using UMount." +msgstr "" +"CDROM URI - CDROM URI はマウントポイントの設定のみを行います。<filename>/etc/" +"fstab</filename> で設定されているように、CDROM ドライブのマウントポイントを " +"<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古" +"い mount パッケージなど) マウントポイントが fstab に記述できない場合、かわり" +"にマウント・アンマウントコマンドも使用できます。文法は、cdrom ブロックを " +"<placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを" +"後につけるのが重要です。アンマウントコマンドは UMount で指定することができま" +"す。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:300 +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:301 +msgid "" +"GPGV URIs; the only option for GPGV URIs is the option to pass additional " +"parameters to gpgv. <literal>gpgv::Options</literal> Additional options " +"passed to gpgv." +msgstr "" +"GPGV URI - GPGV URI 用の唯一のオプションは、gpgv に渡す追加パラメータのオプ" +"ションです。<literal>gpgv::Options</literal> が gpgv に渡す追加オプションで" +"す。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:173 +msgid "" +"The <literal>Acquire</literal> group of options controls the download of " +"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"オプションの <literal>Acquire</literal> グループは、パッケージのダウンロード" +"や URI ハンドラの制御を行います。<placeholder type=\"variablelist\" id=\"0\"/" +">" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:310 +msgid "Directories" +msgstr "ディレクトリ" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:312 +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>." +msgstr "" +"<literal>Dir::State</literal> セクションは、ローカル状態情報に関するディレク" +"トリを保持します。<literal>lists</literal> は、ダウンロードしたパッケージ一覧" +"を格納するディレクトリで、<literal>status</literal> は dpkg の状態ファイルの" +"名前を表します。<literal>preferences</literal> は APT の 設定ファイルの名前で" +"す。<literal>Dir::State</literal> には、<filename>/</filename> や " +"<filename>./</filename> で始まらないサブアイテムすべてに、前に付加するデフォ" +"ルトディレクトリを含んでいます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:319 +msgid "" +"<literal>Dir::Cache</literal> contains locations pertaining to local cache " +"information, such as the two package caches <literal>srcpkgcache</literal> " +"and <literal>pkgcache</literal> as well as the location to place downloaded " +"archives, <literal>Dir::Cache::archives</literal>. Generation of caches can " +"be turned off by setting their names to be blank. This will slow down " +"startup but save disk space. It is probably preferred to turn off the " +"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " +"default directory is contained in <literal>Dir::Cache</literal>" +msgstr "" +"<literal>Dir::Cache</literal> は、ローカルキャッシュ情報に関する場所を格納し" +"ています。これは、ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::" +"archives</literal> と同様に、<literal>srcpkgcache</literal> と " +"<literal>pkgcache</literal> のパッケージキャッシュの場所になります。それぞれ" +"を空にセットすることで、キャッシュの生成を無効にできます。これにより起動時に" +"遅くなりますが、ディスク容量を節約できます。おそらく、srcpkgcache よりも " +"pkgcache を無効にすることが多いと思います。<literal>Dir::State</literal> と同" +"様、<literal>Dir::Cache</literal> はデフォルトディレクトリを含んでいます。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:328 +msgid "" +"<literal>Dir::Etc</literal> contains the location of configuration files, " +"<literal>sourcelist</literal> gives the location of the sourcelist and " +"<literal>main</literal> is the default configuration file (setting has no " +"effect, unless it is done from the config file specified by " +"<envar>APT_CONFIG</envar>)." +msgstr "" +"<literal>Dir::Etc</literal> は設定ファイルの場所を格納しています。" +"<literal>sourcelist</literal> はソースリストの場所を示し、<literal>main</" +"literal> はデフォルトの設定ファイルです。(<envar>APT_CONFIG</envar> で設定" +"ファイルを指定された場合のみ、この設定の効果があります)" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:334 +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 " +"main config file is loaded." +msgstr "" +"<literal>Dir::Parts</literal> 設定は、指定されたディレクトリから、字句単位の" +"全ての設定断片を読みこみます。これを設定した後に、メイン設定ファイルをロード" +"します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:338 +msgid "" +"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" +"Bin::Methods</literal> specifies the location of the method handlers and " +"<literal>gzip</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> " +"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and " +"<literal>apt-cache</literal> specify the location of the respective programs." +msgstr "" +"バイナリプログラムは <literal>Dir::Bin</literal> で指定します。<literal>Dir::" +"Bin::Methods</literal> はメソッドハンドラの場所を指定し、<literal>gzip</" +"literal>, <literal>dpkg</literal>, <literal>apt-get</literal>, <literal>dpkg-" +"source</literal>, <literal>dpkg-buildpackage</literal>, <literal>apt-cache</" +"literal> はそれぞれプログラムの場所を指定します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:345 +msgid "" +"The configuration item <literal>RootDir</literal> has a special meaning. If " +"set, all paths in <literal>Dir::</literal> will be relative to " +"<literal>RootDir</literal>, <emphasis>even paths that are specified " +"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is " +"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</" +"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the " +"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</" +"filename>." +msgstr "" +"設定項目 <literal>RootDir</literal> は特別な意味を持ちます。設定されている" +"と、<literal>Dir::</literal> のすべてのパスは、<emphasis>絶対パスとして指定し" +"ても</emphasis><literal>RootDir</literal> からの相対パスとなります。そのため" +"例えば、<literal>RootDir</literal> が <filename>/tmp/staging</filename> に" +"セットされており、<literal>Dir::State::status</literal> が <filename>/var/" +"lib/dpkg/status</filename> にセットされている場合、status ファイルを " +"<filename>/tmp/staging/var/lib/dpkg/status</filename> から探します。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:358 +msgid "APT in DSelect" +msgstr "DSelect での APT" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:360 +msgid "" +"When APT is used as a &dselect; method several configuration directives " +"control the default behaviour. These are in the <literal>DSelect</literal> " +"section." +msgstr "" +"&dselect; 上で APT を使用する際、<literal>DSelect</literal> セクション以下の" +"設定項目で、デフォルトの動作を制御します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:364 +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:365 +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 " +"upgrading, prompt (the default) does so conditionally. auto removes only " +"those packages which are no longer downloadable (replaced with a new version " +"for instance). pre-auto performs this action before downloading new " +"packages." +msgstr "" +"キャッシュクリーンモード - この値は always, prompt, auto, pre-auto, never の" +"うちひとつを取ります。always と prompt は更新後、全パッケージをキャッシュから" +"削除します。prompt (デフォルト) では条件付きで削除します。auto はダウンロード" +"不能パッケージ (例えば新バージョンで置き換えられたもの) を削除します。pre-" +"auto はこの動作を、新パッケージをダウンロードする直前に行います。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:374 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the install phase." +msgstr "" +"この変数の内容は、install 時のコマンドラインオプションと同様に &apt-get; に渡" +"されます。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:378 +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:379 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the update phase." +msgstr "" +"この変数の内容は、update 時のコマンドラインオプションと同様に &apt-get; に渡" +"されます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:383 +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:384 +msgid "" +"If true the [U]pdate operation in &dselect; will always prompt to continue. " +"The default is to prompt only on error." +msgstr "" +"true の場合、&dselect; の [U]pdate 実行時に、続行のためのプロンプトを毎回表示" +"します。デフォルトはエラーが発生した場合のみです。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:390 +msgid "How APT calls dpkg" +msgstr "APT が dpkg を呼ぶ方法" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:391 +msgid "" +"Several configuration directives control how APT invokes &dpkg;. These are " +"in the <literal>DPkg</literal> section." +msgstr "" +"いくつかの設定項目で APT がどのように &dpkg; を呼び出すかを制御できます。" +"<literal>DPkg</literal> セクションにあります。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:396 +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 " +"&dpkg;." +msgstr "" +"dpkg に渡すオプションのリストです。オプションは、リスト記法を使用して指定しな" +"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:401 +msgid "Pre-Invoke" +msgstr "Pre-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:401 +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:402 +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort." +msgstr "" +"&dpkg; を呼び出す前後で実行するシェルコマンドのリストです。<literal>options</" +"literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/" +"bin/sh</filename> を使用して呼び出され、何か問題があれば APT は異常終了しま" +"す。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:408 +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:409 +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort. APT will pass to the commands on standard input the " +"filenames of all .deb files it is going to install, one per line." +msgstr "" +"&dpkg; を呼び出す前に実行するシェルコマンドのリストです。<literal>options</" +"literal> のようにリスト記法で指定しなければなりません。コマンドは <filename>/" +"bin/sh</filename> を通して呼び出され、何か問題があれば、APT は異常終了しま" +"す。APT はインストールしようとする全 .deb ファイルのファイル名を、ひとつずつ" +"コマンドの標準入力に送ります。" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:415 +msgid "" +"Version 2 of this protocol dumps more information, including the protocol " +"version, the APT configuration space and the packages, files and versions " +"being changed. Version 2 is enabled by setting <literal>DPkg::Tools::" +"options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command " +"given to <literal>Pre-Install-Pkgs</literal>." +msgstr "" +"このプロトコルのバージョン 2 では、(プロトコルのバージョンや APT 設定スペー" +"ス、パッケージを含む) 詳細情報やファイル、変更されているバージョンを出力しま" +"す。<literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、" +"バージョン 2 を有効にできます。<literal>cmd</literal> は <literal>Pre-" +"Install-Pkgs</literal> で与えられるコマンドです。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:422 +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:423 +msgid "" +"APT chdirs to this directory before invoking dpkg, the default is <filename>/" +"</filename>." +msgstr "" +"APT は dpkg を呼び出す前にこのディレクトリに移動します。デフォルトは " +"<filename>/</filename> です。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:427 +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:428 +msgid "" +"These options are passed to &dpkg-buildpackage; when compiling packages, the " +"default is to disable signing and produce all binaries." +msgstr "" +"これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され" +"ます。デフォルトでは署名を無効にし、全バイナリを生成します。" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:435 +msgid "Periodic and Archives options" +msgstr "Periodic オプションと Archives オプション" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:436 +msgid "" +"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " +"of options configure behavior of apt periodic updates, which is done by " +"<literal>/etc/cron.daily/apt</literal> script. See header of this script for " +"the brief documentation of these options." +msgstr "" +"オプションの <literal>APT::Periodic</literal> グループと <literal>APT::" +"Archives</literal> グループは、<literal>/etc/cron.daily/apt</literal> スクリ" +"プトを使用して、apt の定期更新の挙動を設定します。このオプションのドキュメン" +"トは、このスクリプトの先頭を参照してください。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:444 +msgid "Debug options" +msgstr "デバッグオプション" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:446 +msgid "" +"Enabling options in the <literal>Debug::</literal> section will cause " +"debugging information to be sent to the standard error stream of the program " +"utilizing the <literal>apt</literal> libraries, or enable special program " +"modes that are primarily useful for debugging the behavior of <literal>apt</" +"literal>. Most of these options are not interesting to a normal user, but a " +"few may be:" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:457 +msgid "" +"<literal>Debug::pkgProblemResolver</literal> enables output about the " +"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" +"literal>." +msgstr "" +"<literal>Debug::pkgProblemResolver</literal> は、<literal>dist-upgrade, " +"upgrade, install, remove, purge</literal> で行われた判断についての出力を有効" +"にします。" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:465 +msgid "" +"<literal>Debug::NoLocking</literal> disables all file locking. This can be " +"used to run some operations (for instance, <literal>apt-get -s install</" +"literal>) as a non-root user." +msgstr "" +"<literal>Debug::NoLocking</literal> はファイルロックをすべて無効にします。こ" +"れは、非 root ユーザとして操作 (例えば <literal>apt-get -s install</" +"literal>) を行う場合に使用します。" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:474 +msgid "" +"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " +"time that <literal>apt</literal> invokes &dpkg;." +msgstr "" + +#. TODO: provide a +#. 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:482 +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:492 +msgid "A full list of debugging options to apt follows." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +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:501 +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:508 +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:512 +msgid "Print information related to downloading packages using FTP." +msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:519 +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:523 +msgid "Print information related to downloading packages using HTTP." +msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +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:534 +msgid "Print information related to downloading packages using HTTPS." +msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:541 +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:545 +msgid "" +"Print information related to verifying cryptographic signatures using " +"<literal>gpg</literal>." +msgstr "" +"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:552 +msgid "<literal>Debug::aptcdrom</literal>" +msgstr "<literal>Debug::aptcdrom</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:556 +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:563 +msgid "<literal>Debug::BuildDeps</literal>" +msgstr "<literal>Debug::BuildDeps</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:566 +msgid "Describes the process of resolving build-dependencies in &apt-get;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:573 +msgid "<literal>Debug::Hashes</literal>" +msgstr "<literal>Debug::Hashes</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:576 +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:583 +msgid "<literal>Debug::IdentCDROM</literal>" +msgstr "<literal>Debug::IdentCDROM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:586 +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 " +"a CD-ROM." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:594 +msgid "<literal>Debug::NoLocking</literal>" +msgstr "<literal>Debug::NoLocking</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:597 +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:605 +msgid "<literal>Debug::pkgAcquire</literal>" +msgstr "<literal>Debug::pkgAcquire</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:609 +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:616 +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:619 +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:626 +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:629 +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:637 +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:641 +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:648 +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:652 +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:659 +msgid "<literal>Debug::pkgAutoRemove</literal>" +msgstr "<literal>Debug::pkgAutoRemove</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:663 +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:670 +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:673 +msgid "" +"Generate debug messages describing which packages are being automatically " +"installed to resolve dependencies. This corresponds to the initial auto-" +"install pass performed in, e.g., <literal>apt-get install</literal>, and not " +"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::" +"pkgProblemResolver</literal> for that." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:684 +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:687 +msgid "" +"Generate debug messages describing which package is marked as keep/install/" +"remove while the ProblemResolver does his work. Each addition or deletion " +"may trigger additional actions; they are shown indented two additional space " +"under the original entry. The format for each line is <literal>MarkKeep</" +"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> " +"followed by <literal>package-name <a.b.c -> d.e.f | x.y.z> (section)" +"</literal> where <literal>a.b.c</literal> is the current version of the " +"package, <literal>d.e.f</literal> is the version considered for installation " +"and <literal>x.y.z</literal> is a newer version, but not considered for " +"installation (because of a low pin score). The later two can be omitted if " +"there is none or if it is the same version as the installed. " +"<literal>section</literal> is the name of the section the package appears in." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:706 +msgid "<literal>Debug::pkgInitConfig</literal>" +msgstr "<literal>Debug::pkgInitConfig</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:709 +msgid "Dump the default configuration to standard error on startup." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:716 +msgid "<literal>Debug::pkgDPkgPM</literal>" +msgstr "<literal>Debug::pkgDPkgPM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:719 +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:727 +msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" +msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:730 +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:737 +msgid "<literal>Debug::pkgOrderList</literal>" +msgstr "<literal>Debug::pkgOrderList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:741 +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:749 +msgid "<literal>Debug::pkgPackageManager</literal>" +msgstr "<literal>Debug::pkgPackageManager</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:753 +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:760 +msgid "<literal>Debug::pkgPolicy</literal>" +msgstr "<literal>Debug::pkgPolicy</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:764 +msgid "Output the priority of each package list on startup." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:770 +msgid "<literal>Debug::pkgProblemResolver</literal>" +msgstr "<literal>Debug::pkgProblemResolver</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:774 +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:782 +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:785 +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 " +"described in <literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:793 +msgid "<literal>Debug::sourceList</literal>" +msgstr "<literal>Debug::sourceList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:797 +msgid "" +"Print information about the vendors read from <filename>/etc/apt/vendors." +"list</filename>." +msgstr "" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:819 +msgid "" +"&configureindex; is a configuration file showing example values for all " +"possible options." +msgstr "" +"&configureindex; に、全利用可能オプションのデフォルト値を参照できる、設定ファ" +"イルのサンプルがあります。" + +# type: Content of: <refentry><refsect1><para> +#. ? reading apt.conf +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:829 +msgid "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-cache;, &apt-config;, &apt-preferences;." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt_preferences.5.xml:13 +msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: apt_preferences.5.xml:21 apt_preferences.5.xml:27 +msgid "apt_preferences" +msgstr "apt_preferences" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt_preferences.5.xml:28 +msgid "Preference control file for APT" +msgstr "APT 設定制御ファイル" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:33 +msgid "" +"The APT preferences file <filename>/etc/apt/preferences</filename> can be " +"used to control which versions of packages will be selected for installation." +msgstr "" +"APT 設定ファイル <filename>/etc/apt/preferences</filename> は、インストールす" +"るパッケージのバージョン選択を制御するのに使用します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:37 +msgid "" +"Several versions of a package may be available for installation when the " +"&sources-list; file contains references to more than one distribution (for " +"example, <literal>stable</literal> and <literal>testing</literal>). APT " +"assigns a priority to each version that is available. Subject to dependency " +"constraints, <command>apt-get</command> selects the version with the highest " +"priority for installation. The APT preferences file overrides the " +"priorities that APT assigns to package versions by default, thus giving the " +"user control over which one is selected for installation." +msgstr "" +"&sources-list; ファイルに複数のディストリビューション (<literal>stable</" +"literal> と <literal>testing</literal> など) が指定されていて、パッケージに対" +"し複数のバージョンがインストールできることがあります。このとき APT は、利用で" +"きるバージョンごとに優先度を割り当てます。依存関係規則を条件として、" +"<command>apt-get</command> は、最も高い優先度を持つバージョンをインストールす" +"るよう選択します。APT 設定ファイルは、APT がデフォルトで割り当てた、パッケー" +"ジのバージョンの優先度を上書きします。その結果インストールするものの選択を、" +"ユーザが選択できるようになります。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:47 +msgid "" +"Several instances of the same version of a package may be available when the " +"&sources-list; file contains references to more than one source. In this " +"case <command>apt-get</command> downloads the instance listed earliest in " +"the &sources-list; file. The APT preferences file does not affect the " +"choice of instance, only the choice of version." +msgstr "" +"&sources-list; ファイルに複数の参照が書かれている場合、パッケージの同じバー" +"ジョンのインスタンスが複数利用できる可能性があります。この場合、<command>apt-" +"get</command> は &sources-list; ファイルの初めの方に指定されているところから" +"ダウンロードします。APT 設定ファイルはバージョンの選択にのみ影響し、インスタ" +"ンスの選択には影響しません。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:54 +msgid "APT's Default Priority Assignments" +msgstr "APT のデフォルト優先度の割り当て" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:69 +#, no-wrap +msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" +msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:72 +#, no-wrap +msgid "APT::Default-Release \"stable\";\n" +msgstr "APT::Default-Release \"stable\";\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:56 +msgid "" +"If there is no preferences file or if there is no entry in the file that " +"applies to a particular version then the priority assigned to that version " +"is the priority of the distribution to which that version belongs. It is " +"possible to single out a distribution, \"the target release\", which " +"receives a higher priority than other distributions do by default. The " +"target release can be set on the <command>apt-get</command> command line or " +"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note " +"that this has precedence over any general priority you set in the <filename>/" +"etc/apt/preferences</filename> file described later, but not over " +"specifically pinned packages. For example, <placeholder type=" +"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" +msgstr "" +"設定ファイルがなかったり、設定ファイルに特定のパッケージを割り当てるエントリ" +"がない場合、そのバージョンの優先度は、そのバージョンが属しているディストリ" +"ビューションの優先度となります。デフォルトで他のディストリビューションより高" +"い優先度を持つ、特定のディストリビューションを「ターゲットリリース」としてお" +"けます。後述する <filename>/etc/apt/preferences</filename> ファイルで設定した" +"一般優先度よりもこれは優先されますが、pin 止めしたパッケージには及ばないこと" +"に注意してください。例えば以下のようになります。<placeholder type=" +"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:81 +msgid "priority 100" +msgstr "priority 100" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:82 +msgid "to the version that is already installed (if any)." +msgstr "(あるならば) 既にインストールされているバージョン。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:86 +msgid "priority 500" +msgstr "priority 500" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:87 +msgid "" +"to the versions that are not installed and do not belong to the target " +"release." +msgstr "インストールされておらず、ターゲットリリースに含まれないバージョン。" + +# type: <tag></tag> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:91 +msgid "priority 990" +msgstr "priority 990" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:92 +msgid "" +"to the versions that are not installed and belong to the target release." +msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:76 +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"ターゲットリリースが指定されると、APT は以下のアルゴリズムで、パッケージの" +"バージョンの優先度を設定します。以下のように割り当てます。<placeholder type=" +"\"variablelist\" id=\"0\"/>" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:97 +msgid "" +"If the target release has not been specified then APT simply assigns " +"priority 100 to all installed package versions and priority 500 to all " +"uninstalled package versions." +msgstr "" +"ターゲットリリースが指定されていなければ、APT は単純にインストールしている" +"パッケージのバージョンには 100 を、インストールしていないパッケージのバージョ" +"ンには 500 を割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:101 +msgid "" +"APT then applies the following rules, listed in order of precedence, to " +"determine which version of a package to install." +msgstr "" +"APT は、インストールするパッケージのバージョンを決定するために、以下のルール" +"を上から順番に適用します。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:104 +msgid "" +"Never downgrade unless the priority of an available version exceeds 1000. " +"(\"Downgrading\" is installing a less recent version of a package in place " +"of a more recent version. Note that none of APT's default priorities " +"exceeds 1000; such high priorities can only be set in the preferences file. " +"Note also that downgrading a package can be risky.)" +msgstr "" +"有効なバージョンの優先度が 1000 を越えない場合、決してダウングレードしませ" +"ん。(「ダウングレード」は、現在のパッケージのバージョンよりも、小さいバージョ" +"ンのものをインストールします。APT のデフォルト優先度が 1000 を越えないことに" +"注意してください。そのような優先度は設定ファイルでのみ設定できます。また、" +"パッケージのダウングレードは危険であることにも注意してください)" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:110 +msgid "Install the highest priority version." +msgstr "最も高い優先度のバージョンをインストールします。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:111 +msgid "" +"If two or more versions have the same priority, install the most recent one " +"(that is, the one with the higher version number)." +msgstr "" +"同じ優先度のバージョンが複数存在する場合、最も新しいもの (最もバージョン番号" +"が高いもの) をインストールします。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:114 +msgid "" +"If two or more versions have the same priority and version number but either " +"the packages differ in some of their metadata or the <literal>--reinstall</" +"literal> option is given, install the uninstalled one." +msgstr "" +"優先度・バージョン番号が同じものが複数存在し、そのパッケージのメタデータが異" +"なるか <literal>--reinstall</literal> オプションが与えられている場合、インス" +"トールされていないものをインストールします。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:120 +msgid "" +"In a typical situation, the installed version of a package (priority 100) " +"is not as recent as one of the versions available from the sources listed in " +"the &sources-list; file (priority 500 or 990). Then the package will be " +"upgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"よくある状況として、あるインストールされているパッケージのバージョン (優先度 " +"100) が、&sources-list; ファイルのリストから得られるバージョン (優先度 500 " +"か 990) よりも新しくないということがあります。この場合、<command>apt-get " +"install <replaceable>some-package</replaceable></command> や <command>apt-" +"get upgrade</command> を実行するとパッケージが更新されます。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:127 +msgid "" +"More rarely, the installed version of a package is <emphasis>more</emphasis> " +"recent than any of the other available versions. The package will not be " +"downgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"まれに、インストールされているパッケージのバージョンが、<emphasis>他の有効な" +"バージョンよりも</emphasis>新しい場合があります。この時 <command>apt-get " +"install <replaceable>some-package</replaceable></command> や <command>apt-" +"get upgrade</command> を実行しても、ダウングレードしません。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:132 +msgid "" +"Sometimes the installed version of a package is more recent than the version " +"belonging to the target release, but not as recent as a version belonging to " +"some other distribution. Such a package will indeed be upgraded when " +"<command>apt-get install <replaceable>some-package</replaceable></command> " +"or <command>apt-get upgrade</command> is executed, because at least " +"<emphasis>one</emphasis> of the available versions has a higher priority " +"than the installed version." +msgstr "" +"時々、インストールしているパッケージのバージョンが、ターゲットリリースに属す" +"るバージョンよりも新しく、他のディストリビューションよりも古い場合がありま" +"す。そのようなパッケージに対して <command>apt-get install <replaceable>some-" +"package</replaceable></command> や <command>apt-get upgrade</command> を実行" +"すると、パッケージは更新されます。この場合、インストールされているバージョン" +"よりも、少なくとも<emphasis>ひとつ</emphasis>は、高い優先度を持つ有効なパッ" +"ケージがあるからです。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:141 +msgid "The Effect of APT Preferences" +msgstr "APT 設定の効果" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:143 +msgid "" +"The APT preferences file allows the system administrator to control the " +"assignment of priorities. The file consists of one or more multi-line " +"records separated by blank lines. Records can have one of two forms, a " +"specific form and a general form." +msgstr "" +"APT 設定ファイルを使うと、システム管理者が優先度を割り当てられるようになりま" +"す。ファイルは、空白行で区切られた、複数行からなるレコードで構成されていま" +"す。レコードは特定形式か、汎用形式のどちらかの形式をとります。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:149 +msgid "" +"The specific form assigns a priority (a \"Pin-Priority\") to one or more " +"specified packages and specified version or version range. For example, the " +"following record assigns a high priority to all versions of the " +"<filename>perl</filename> package whose version number begins with " +"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." +msgstr "" +"特定形式は、優先度 (\"Pin-Priority\") を、指定したパッケージの指定したバー" +"ジョン (範囲) について割り当てます。例えば以下のレコードは、\"<literal>5.8</" +"literal>\" で始まる <filename>perl</filename> パッケージを、高い優先度に設定" +"します。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:156 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:162 +msgid "" +"The general form assigns a priority to all of the package versions in a " +"given distribution (that is, to all the versions of packages that are listed " +"in a certain <filename>Release</filename> file) or to all of the package " +"versions coming from a particular Internet site, as identified by the site's " +"fully qualified domain name." +msgstr "" +"汎用形式は、与えられたディストリビューションにある、すべてのパッケージ " +"(<filename>Release</filename> ファイルに列挙したパッケージ) の優先度や、FQDN" +"で指定した、特定のインターネットサイトから取得するパッケージの優先度を割り当" +"てます。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:168 +msgid "" +"This general-form entry in the APT preferences file applies only to groups " +"of packages. For example, the following record assigns a high priority to " +"all package versions available from the local site." +msgstr "" +"APT 設定ファイルに書かれている汎用形式のエントリは、パッケージのグループにつ" +"いてのみ適用されます。例えば以下のレコードは、ローカルサイトにある全パッケー" +"ジについて、高い優先度を割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:173 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +msgstr "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:178 +msgid "" +"A note of caution: the keyword used here is \"<literal>origin</literal>\". " +"This should not be confused with the Origin of a distribution as specified " +"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in " +"a <filename>Release</filename> file is not an Internet address but an author " +"or vendor name, such as \"Debian\" or \"Ximian\"." +msgstr "" +"注意: ここで使用しているキーワードは \"<literal>origin</literal>\" です。" +"<filename>Release</filename> ファイルに指定されたような、ディストリビューショ" +"ンの Origin と混同しないようにしてください。<filename>Release</filename> ファ" +"イルにある \"Origin:\" タグは、インターネットアドレスではなく、\"Debian\" や " +"\"Ximian\" といった作者やベンダ名です。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:184 +msgid "" +"The following record assigns a low priority to all package versions " +"belonging to any distribution whose Archive name is \"<literal>unstable</" +"literal>\"." +msgstr "" +"以下のレコードは、アーカイブ名が \"<literal>unstable</literal>\" となっている" +"ディストリビューションに属するパッケージを、すべて低い優先度に割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:188 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:193 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any distribution whose Codename is \"<literal>squeeze</literal>" +"\"." +msgstr "" +"以下のレコードは、コード名が \"<literal>squeeze</literal>\" となっているディ" +"ストリビューションに属するパッケージを、すべて高い優先度に割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:197 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +msgstr "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:202 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any release whose Archive name is \"<literal>stable</literal>\" " +"and whose release Version number is \"<literal>3.0</literal>\"." +msgstr "" +"以下のレコードは、アーカイブ名が \"<literal>stable</literal>\" で、リリース" +"バージョン番号が \"<literal>3.0</literal>\" となっているリリースに属するパッ" +"ケージを、すべて高い優先度に割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:207 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:218 +msgid "How APT Interprets Priorities" +msgstr "APT が優先度に割り込む方法" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:226 +msgid "P > 1000" +msgstr "P > 1000" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:227 +msgid "" +"causes a version to be installed even if this constitutes a downgrade of the " +"package" +msgstr "" +"パッケージがダウングレードしても、このバージョンのパッケージをインストール" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:231 +msgid "990 < P <=1000" +msgstr "990 < P <=1000" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:232 +msgid "" +"causes a version to be installed even if it does not come from the target " +"release, unless the installed version is more recent" +msgstr "" +"インストールされているバージョンの方が新しいことを除き、ターゲットリリースに" +"含まれなくても、このバージョンのパッケージをインストール" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:237 +msgid "500 < P <=990" +msgstr "500 < P <=990" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:238 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to the target release or the installed version is more recent" +msgstr "" +"ターゲットリリースに属するバージョンがあったり、インストールされているバー" +"ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:243 +msgid "100 < P <=500" +msgstr "100 < P <=500" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:244 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to some other distribution or the installed version is more recent" +msgstr "" +"他のディストリビューションに属するバージョンがあったり、インストールされてい" +"るバージョンの方が新しいのでなければ、このバージョンのパッケージをインストー" +"ル" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:249 +msgid "0 < P <=100" +msgstr "0 < P <=100" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:250 +msgid "" +"causes a version to be installed only if there is no installed version of " +"the package" +msgstr "" +"このパッケージがインストールされていない場合、このバージョンのパッケージをイ" +"ンストール" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:254 +msgid "P < 0" +msgstr "P < 0" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:255 +msgid "prevents the version from being installed" +msgstr "このバージョンのインストール禁止" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:221 +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking): " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ" +"れは (おおざっぱにいうと) 以下のように解釈されます。<placeholder type=" +"\"variablelist\" id=\"0\"/>" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:260 +msgid "" +"If any specific-form records match an available package version then the " +"first such record determines the priority of the package version. Failing " +"that, if any general-form records match an available package version then " +"the first such record determines the priority of the package version." +msgstr "" +"特定形式のレコードが利用可能パッケージバージョンに一致した場合、最初のレコー" +"ドが、パッケージバージョンの優先度を決定します。失敗して、汎用形式のレコード" +"が利用可能パッケージバージョンに一致した場合、最初のレコードが、パッケージ" +"バージョンの優先度を決定します。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:266 +msgid "" +"For example, suppose the APT preferences file contains the three records " +"presented earlier:" +msgstr "" +"例えば、APT 設定ファイルの上の方に、以下のレコードが書かれていると仮定してく" +"ださい。" + +# type: Content of: <refentry><refsect1><refsect2><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:270 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:283 +msgid "Then:" +msgstr "すると、以下のように動作します。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:285 +msgid "" +"The most recent available version of the <literal>perl</literal> package " +"will be installed, so long as that version's version number begins with " +"\"<literal>5.8</literal>\". If <emphasis>any</emphasis> 5.8* version of " +"<literal>perl</literal> is available and the installed version is 5.9*, then " +"<literal>perl</literal> will be downgraded." +msgstr "" +"バージョン番号が \"<literal>5.8</literal>\" で始まっていれば、<literal>perl</" +"literal> の最新の利用可能パッケージがインストールされます。バージョン 5.8* が" +"利用可能で、バージョン 5.9* がインストールされている場合、<literal>perl</" +"literal> はダウングレードされます。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:290 +msgid "" +"A version of any package other than <literal>perl</literal> that is " +"available from the local system has priority over other versions, even " +"versions belonging to the target release." +msgstr "" +"ローカルシステムで有効な、<literal>perl</literal> 以外のどんなパッケージで" +"も、他のバージョンより (たとえターゲットリリースに属していても) 優先度が高く" +"なります。" + +# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:294 +msgid "" +"A version of a package whose origin is not the local system but some other " +"site listed in &sources-list; and which belongs to an <literal>unstable</" +"literal> distribution is only installed if it is selected for installation " +"and no version of the package is already installed." +msgstr "" +"ローカルシステムにはなくても &sources-list; に列挙されたサイトにあるバージョ" +"ンで、<literal>unstable</literal> ディストリビューションに属しているパッケー" +"ジは、インストールするよう選択され、既にインストールされているバージョンがな" +"い場合にのみインストールされます。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:304 +msgid "Determination of Package Version and Distribution Properties" +msgstr "パッケージのバージョンとディストリビューションプロパティの決定" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:306 +msgid "" +"The locations listed in the &sources-list; file should provide " +"<filename>Packages</filename> and <filename>Release</filename> files to " +"describe the packages available at that location." +msgstr "" +"&sources-list; ファイルに列挙した場所では、その場所で利用できるパッケージを記" +"述した、<filename>Packages</filename> ファイルや <filename>Release</" +"filename> ファイルを提供します。" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:318 +msgid "the <literal>Package:</literal> line" +msgstr "<literal>Package:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:319 +msgid "gives the package name" +msgstr "パッケージ名" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:322 apt_preferences.5.xml:372 +msgid "the <literal>Version:</literal> line" +msgstr "<literal>Version:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:323 +msgid "gives the version number for the named package" +msgstr "その名前のパッケージのバージョン番号" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:310 +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/" +"<replaceable>component</replaceable>/<replaceable>arch</replaceable></" +"filename>: for example, <filename>.../dists/stable/main/binary-i386/" +"Packages</filename>. It consists of a series of multi-line records, one for " +"each package available in that directory. Only two lines in each record are " +"relevant for setting APT priorities: <placeholder type=\"variablelist\" id=" +"\"0\"/>" +msgstr "" +"<filename>Packages</filename> ファイルは通常 <filename>.../dists/" +"<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/" +"<replaceable>arch</replaceable></filename> ディレクトリにあります。例えば、" +"<filename>.../dists/stable/main/binary-i386/Packages</filename> です。これ" +"は、ディレクトリにある利用可能パッケージごとに、複数行のレコードからできてい" +"ます。APT 優先度の設定は、レコードごとに以下の 2 行だけです。<placeholder " +"type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:339 +msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" +msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:340 +#, fuzzy +msgid "" +"names the archive to which all the packages in the directory tree belong. " +"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " +"that all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file are in a <literal>stable</literal> " +"archive. Specifying this value in the APT preferences file would require " +"the line:" +msgstr "" +"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、" +"\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親ディ" +"レクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカイブ" +"だと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要になり" +"ます。" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:350 +#, no-wrap +msgid "Pin: release a=stable\n" +msgstr "Pin: release a=stable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:356 +msgid "the <literal>Codename:</literal> line" +msgstr "<literal>Codename:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:357 +#, fuzzy +msgid "" +"names the codename to which all the packages in the directory tree belong. " +"For example, the line \"Codename: squeeze\" specifies that all of the " +"packages in the directory tree below the parent of the <filename>Release</" +"filename> file belong to a version named <literal>squeeze</literal>. " +"Specifying this value in the APT preferences file would require the line:" +msgstr "" +"このディレクトリツリーに属する全パッケージのアーカイブ名です。例えば、" +"\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親ディ" +"レクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカイブ" +"だと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要になり" +"ます。" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:366 +#, no-wrap +msgid "Pin: release n=squeeze\n" +msgstr "Pin: release n=squeeze\n" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:373 +msgid "" +"names the release version. For example, the packages in the tree might " +"belong to Debian GNU/Linux release version 3.0. Note that there is normally " +"no version number for the <literal>testing</literal> and <literal>unstable</" +"literal> distributions because they have not been released yet. Specifying " +"this in the APT preferences file would require one of the following lines." +msgstr "" +"リリースバージョン名です。例えば、このツリーのパッケージが、GNU/Linux リリー" +"スバージョン 3.0 に属するとします。通常 <literal>testing</literal> ディストリ" +"ビューションや <literal>unstable</literal> ディストリビューションには、まだリ" +"リースされていないので、バージョン番号が付きません。APT 設定ファイルでこれを" +"指定するには、以下の行のいずれかが必要になります。" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:382 +#, no-wrap +msgid "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" +msgstr "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:391 +msgid "the <literal>Component:</literal> line" +msgstr "<literal>Component:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:392 +msgid "" +"names the licensing component associated with the packages in the directory " +"tree of the <filename>Release</filename> file. For example, the line " +"\"Component: main\" specifies that all the packages in the directory tree " +"are from the <literal>main</literal> component, which entails that they are " +"licensed under terms listed in the Debian Free Software Guidelines. " +"Specifying this component in the APT preferences file would require the line:" +msgstr "" +"<filename>Release</filename> ファイルの、ディレクトリツリーにあるパッケージの" +"ライセンスコンポーネント名です。例えば、\"Component: main\" という行は、この" +"ディレクトリ以下の全ファイルが、<literal>main</literal> コンポーネント " +"(Debian フリーソフトウェアガイドラインの元でライセンスされている) であること" +"を表します。APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必" +"要になります。" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:401 +#, no-wrap +msgid "Pin: release c=main\n" +msgstr "Pin: release c=main\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:407 +msgid "the <literal>Origin:</literal> line" +msgstr "<literal>Origin:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:408 +msgid "" +"names the originator of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this origin in the APT preferences file would require " +"the line:" +msgstr "" +"<filename>Release</filename> ファイルのディレクトリツリーにあるパッケージの提" +"供者名です。ほとんど共通で、<literal>Debian</literal> です。APT 設定ファイル" +"でこの提供者を指定するには、以下の行が必要になります。" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:414 +#, no-wrap +msgid "Pin: release o=Debian\n" +msgstr "Pin: release o=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:420 +msgid "the <literal>Label:</literal> line" +msgstr "<literal>Label:</literal> 行" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:421 +msgid "" +"names the label of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this label in the APT preferences file would require " +"the line:" +msgstr "" +"<filename>Release</filename> ファイルのディレクトリツリーにあるパッケージのラ" +"ベル名です。ほとんど共通で <literal>Debian</literal> です。APT 設定ファイルで" +"このラベルを指定するには、以下の行が必要になります。" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:427 +#, no-wrap +msgid "Pin: release l=Debian\n" +msgstr "Pin: release l=Debian\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:328 +#, fuzzy +msgid "" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or <filename>.../" +"dists/woody/Release</filename>. It consists of a single multi-line record " +"which applies to <emphasis>all</emphasis> of the packages in the directory " +"tree below its parent. Unlike the <filename>Packages</filename> file, " +"nearly all of the lines in a <filename>Release</filename> file are relevant " +"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"<filename>Release</filename> ファイルは、通常 <filename>.../dists/" +"<replaceable>dist-name</replaceable></filename> にあります。例えば、 " +"<filename>.../dists/stable/Release</filename>, <filename>.../dists/woody/" +"Release</filename> です。これは、このディレクトリ以下にある<emphasis>全</" +"emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。" +"<filename>Packages</filename> と違い <filename>Release</filename> ファイル" +"は、ほとんどの行が APT 優先度の設定に関連します。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:434 +msgid "" +"All of the <filename>Packages</filename> and <filename>Release</filename> " +"files retrieved from locations listed in the &sources-list; file are stored " +"in the directory <filename>/var/lib/apt/lists</filename>, or in the file " +"named by the variable <literal>Dir::State::Lists</literal> in the " +"<filename>apt.conf</filename> file. For example, the file <filename>debian." +"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> " +"contains the <filename>Release</filename> file retrieved from the site " +"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> " +"architecture files from the <literal>contrib</literal> component of the " +"<literal>unstable</literal> distribution." +msgstr "" +"&sources-list; ファイルに列挙された場所から取得した <filename>Packages</" +"filename> ファイルや <filename>Release</filename> ファイルはすべて、" +"<filename>/var/lib/apt/lists</filename> ディレクトリや、<filename>apt.conf</" +"filename> ファイルの <literal>Dir::State::Lists</literal> 変数で指定した場所" +"に取得されます。例えば、<filename>debian.lcs.mit." +"edu_debian_dists_unstable_contrib_binary-i386_Release</filename> ファイルは、" +"<literal>debian.lcs.mit.edu</literal> から取得した、<literal>unstable</" +"literal> ディストリビューションで、<literal>contrib</literal> コンポーネント" +"な、<literal>binary-i386</literal> アーキテクチャ用の <filename>Release</" +"filename> ファイルを含んでいます。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:447 +msgid "Optional Lines in an APT Preferences Record" +msgstr "APT 設定レコードのオプション行" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:449 +msgid "" +"Each record in the APT preferences file can optionally begin with one or " +"more lines beginning with the word <literal>Explanation:</literal>. This " +"provides a place for comments." +msgstr "" +"APT 設定ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始" +"まる行を持てます。これは、コメント用の場所を確保します。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:453 +#, fuzzy +msgid "" +"The <literal>Pin-Priority:</literal> line in each APT preferences record is " +"optional. If omitted, APT assigns a priority of 1 less than the last value " +"specified on a line beginning with <literal>Pin-Priority: release ...</" +"literal>." +msgstr "" +"APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する" +"と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後の" +"値 (少なくとも1つ) を優先度に割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:462 +msgid "Tracking Stable" +msgstr "安定版の追跡" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:470 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:464 +#, fuzzy +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"<literal>stable</literal> distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> " +"distributions. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"以下の APT 設定ファイルは、<literal>stable</literal> ディストリビューションに" +"属する全てのパッケージのバージョンに、デフォルト (500) より高い優先度を割り当" +"て、他の <literal>Debian</literal> ディストリビューションのパッケージのバー" +"ジョンには、低くてインストールできないような優先度を割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:487 apt_preferences.5.xml:533 +#: apt_preferences.5.xml:591 +#, no-wrap +msgid "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" +msgstr "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:482 +#, fuzzy +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最" +"新の <literal>stable</literal> バージョンにアップグレードできます。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:499 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/testing\n" +msgstr "apt-get install <replaceable>package</replaceable>/testing\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:493 +#, fuzzy +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>testing</literal> distribution; the package " +"will not be upgraded again unless this command is given again. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"以下のコマンドで、指定したパッケージを <literal>testing</literal> ディストリ" +"ビューションの最新バージョンにアップグレードします。このパッケージは、再度こ" +"のコマンドを発行しないとアップグレードされません。" + +# type: Content of: <refentry><refsect1><refsect2><title> +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:505 +msgid "Tracking Testing or Unstable" +msgstr "テスト版や不安定版の追跡" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:514 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:507 +#, fuzzy +msgid "" +"The following APT preferences file will cause APT to assign a high priority " +"to package versions from the <literal>testing</literal> distribution, a " +"lower priority to package versions from the <literal>unstable</literal> " +"distribution, and a prohibitively low priority to package versions from " +"other <literal>Debian</literal> distributions. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"以下の APT 設定ファイルは、<literal>testing</literal> ディストリビューション" +"のパッケージのバージョンに高い優先度を割り当て、<literal>unstable</literal> " +"ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。" +"また他の <literal>Debian</literal> ディストリビューションのパッケージのバー" +"ジョンには、低くてインストールできないような優先度を割り当てます。" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:528 +#, fuzzy +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最" +"新の <literal>testing</literal> バージョンにアップグレードできます。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:548 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/unstable\n" +msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:539 +#, fuzzy +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>unstable</literal> distribution. " +"Thereafter, <command>apt-get upgrade</command> will upgrade the package to " +"the most recent <literal>testing</literal> version if that is more recent " +"than the installed version, otherwise, to the most recent <literal>unstable</" +"literal> version if that is more recent than the installed version. " +"<placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"以下のコマンドで、指定したパッケージを <literal>unstable</literal> ディストリ" +"ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-" +"get upgrade</command> は <literal>testing</literal> バージョンのパッケージが" +"更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</" +"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>" +"の最新版にアップグレードします。" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:555 +msgid "Tracking the evolution of a codename release" +msgstr "" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:569 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:557 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"specified codename of a distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> distributions, " +"codenames and archives. Note that with this APT preference APT will follow " +"the migration of a release from the archive <literal>testing</literal> to " +"<literal>stable</literal> and later <literal>oldstable</literal>. If you " +"want to follow for example the progress in <literal>testing</literal> " +"notwithstanding the codename changes you should use the example " +"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:586 +#, fuzzy +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest version(s) in " +"the release codenamed with <literal>squeeze</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最" +"新の <literal>stable</literal> バージョンにアップグレードできます。" + +# type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:606 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/sid\n" +msgstr "apt-get install <replaceable>package</replaceable>/sid\n" + +# type: Content of: <refentry><refsect1><refsect2><para> +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:597 +#, fuzzy +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>sid</literal> distribution. Thereafter, " +"<command>apt-get upgrade</command> will upgrade the package to the most " +"recent <literal>squeeze</literal> version if that is more recent than the " +"installed version, otherwise, to the most recent <literal>sid</literal> " +"version if that is more recent than the installed version. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"以下のコマンドで、指定したパッケージを <literal>unstable</literal> ディストリ" +"ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-" +"get upgrade</command> は <literal>testing</literal> バージョンのパッケージが" +"更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</" +"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>" +"の最新版にアップグレードします。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:614 +msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refnamediv><refname> +#: sources.list.5.xml:22 sources.list.5.xml:28 +msgid "sources.list" +msgstr "sources.list" + +# type: Content of: <refentry><refnamediv><refpurpose> +#. type: Content of: <refentry><refnamediv><refpurpose> +#: sources.list.5.xml:29 +msgid "Package resource list for APT" +msgstr "APT 用パッケージリソースリスト" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:33 +msgid "" +"The package resource list is used to locate archives of the package " +"distribution system in use on the system. At this time, this manual page " +"documents only the packaging system used by the Debian GNU/Linux system. " +"This control file is located in <filename>/etc/apt/sources.list</filename>" +msgstr "" +"このパッケージリソースリストは、システムで使用するパッケージの保管場所を特定" +"するのに使用されます。今回このマニュアルページには、Debian GNU/Linux システム" +"で使用するパッケージシステムについてのみ記述します。この制御ファイルは、" +"<filename>/etc/apt/sources.list</filename> にあります。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:38 +msgid "" +"The source list is designed to support any number of active sources and a " +"variety of source media. The file lists one source per line, with the most " +"preferred source listed first. The format of each line is: <literal>type uri " +"args</literal> The first item, <literal>type</literal> determines the format " +"for <literal>args</literal> <literal>uri</literal> is a Universal Resource " +"Identifier (URI), which is a superset of the more specific and well-known " +"Universal Resource Locator, or URL. The rest of the line can be marked as a " +"comment by using a #." +msgstr "" +"ソースリストは複数の有効な取得元と、様々な取得メディアをサポートしています。" +"ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。行の" +"フォーマットは、<literal>タイプ uri 引数</literal> となります。先頭の " +"<literal>タイプ</literal> で、<literal>引数</literal> のフォーマットを決定し" +"ます。<literal>uri</literal> は Universal Resource Identifier (URI) で、よく" +"知られた URL のスーパーセットです。行の残りに # を付けて、コメントにできま" +"す。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:49 +msgid "sources.list.d" +msgstr "sources.list.d" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:50 +#, fuzzy +msgid "" +"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " +"add sources.list entries in separate files. The format is the same as for " +"the regular <filename>sources.list</filename> file. File names need to end " +"with <filename>.list</filename> and may only contain letters (a-z and A-Z), " +"digits (0-9), underscore (_), hyphen (-) and period (.) characters. " +"Otherwise they will be silently ignored." +msgstr "" +"<filename>/etc/apt/sources.list.d</filename> ディレクトリにファイル名が " +"<literal>.list</literal> で終わる個別ファイルを置いておくと、sources.list エ" +"ントリに追加できます。フォーマットは、通常の <filename>sources.list</" +"filename> ファイルと同じです。" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:59 +msgid "The deb and deb-src types" +msgstr "deb タイプと deb-src タイプ" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:60 +msgid "" +"The <literal>deb</literal> type describes a typical two-level Debian " +"archive, <filename>distribution/component</filename>. Typically, " +"<literal>distribution</literal> is generally one of <literal>stable</" +"literal> <literal>unstable</literal> or <literal>testing</literal> while " +"component is one of <literal>main</literal> <literal>contrib</literal> " +"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-" +"src</literal> type describes a debian distribution's source code in the same " +"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line " +"is required to fetch source indexes." +msgstr "" +"<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ " +"(<filename>distribution/component</filename>) を記述します。よくあるケースで" +"は、<literal>distribution</literal> は通常 <literal>stable</literal> " +"<literal>unstable</literal> <literal>testing</literal> のどれか、component " +"は、<literal>main</literal> <literal>contrib</literal> <literal>non-free</" +"literal> <literal>non-us</literal> のどれかです。<literal>deb-src</literal> " +"タイプでは、Debian ディストリビューションのソースコードを、<literal>deb</" +"literal> タイプと同じ形式で記述します。<literal>deb-src</literal> 行は、ソー" +"スインデックスを取得するのに必要です。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:72 +msgid "" +"The format for a <filename>sources.list</filename> entry using the " +"<literal>deb</literal> and <literal>deb-src</literal> types are:" +msgstr "" +"<literal>deb</literal> タイプと <literal>deb-src</literal> タイプで使用する " +"<filename>sources.list</filename> エントリのフォーマットは、以下のようになり" +"ます。" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:75 +#, no-wrap +msgid "deb uri distribution [component1] [component2] [...]" +msgstr "deb uri distribution [component1] [component2] [...]" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:77 +msgid "" +"The URI for the <literal>deb</literal> type must specify the base of the " +"Debian distribution, from which APT will find the information it needs. " +"<literal>distribution</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>distribution</literal> must end with " +"a slash (/). This is useful for when only a particular sub-section of the " +"archive denoted by the URI is of interest. If <literal>distribution</" +"literal> does not specify an exact path, at least one <literal>component</" +"literal> must be present." +msgstr "" +"<literal>deb</literal> タイプの URI は、APT が情報を見つけられるように、" +"Debian ディストリビューションの基底を指定しなければなりません。" +"<literal>distribution</literal> には正確なパスを指定できます。その場合 " +"component を省略し、<literal>distribution</literal> はスラッシュ (/) で終わら" +"なくてはなりません。これは URL で指定されたアーカイブの、特定のサブセクション" +"のみに関心があるときに役に立ちます。<literal>distribution</literal> に正確な" +"パスを指定しないのなら、少なくともひとつは <literal>component</literal> を指" +"定しなければなりません。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:86 +msgid "" +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (i386, m68k, " +"powerpc, ...) used on the system. This permits architecture-independent " +"<filename>sources.list</filename> files to be used. In general this is only " +"of interest when specifying an exact path, <literal>APT</literal> will " +"automatically generate a URI with the current architecture otherwise." +msgstr "" +"<literal>distribution</literal> は、<literal>$(ARCH)</literal> 変数を含む場合" +"があります。<literal>$(ARCH)</literal> 変数は、システムで使用している Debian " +"アーキテクチャ (i386, m68k, powerpc, ...) に展開されます。これにより、アーキ" +"テクチャに依存しない <filename>sources.list</filename> ファイルを使用できま" +"す。一般的に、これは正しいパスを指定するときに気にするだけです。そうでない場" +"合は、<literal>APT</literal> は現在のアーキテクチャで URI を自動的に生成しま" +"す。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:94 +msgid "" +"Since only one distribution can be specified per line it may be necessary to " +"have multiple lines for the same URI, if a subset of all available " +"distributions or components at that location is desired. APT will sort the " +"URI list after it has generated a complete set internally, and will collapse " +"multiple references to the same Internet host, for instance, into a single " +"connection, so that it does not inefficiently establish an FTP connection, " +"close it, do something else, and then re-establish a connection to that same " +"host. This feature is useful for accessing busy FTP sites with limits on the " +"number of simultaneous anonymous users. APT also parallelizes connections to " +"different hosts to more effectively deal with sites with low bandwidth." +msgstr "" +"有効な全 distribution, component の場所から、一部が必要な場合、1 行につき 1 " +"distribution しか指定できないため、同じ URI の行を複数記述することになるで" +"しょう。APT は内部で URI リストを生成してから、並べ替えます。そして、同じイン" +"ターネットホストに対しては複数の参照をまとめます。例えば FTP 接続後、切断して" +"からまた同じホストに再接続するといった、効率の悪いことをせずに、1 接続にまと" +"めます。この機能は、同時接続匿名ユーザ数を制限している、混んでいる FTP サイト" +"にアクセスするのに便利です。APT は、帯域の狭いサイトを効率よく扱うのに、異な" +"るホストへは、接続を並行して行うようにもしています。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:106 +msgid "" +"It is important to list sources in order of preference, with the most " +"preferred source listed first. Typically this will result in sorting by " +"speed from fastest to slowest (CD-ROM followed by hosts on a local network, " +"followed by distant Internet hosts, for example)." +msgstr "" +"最優先する取得元を最初に記述するというように、優先順に取得元を記述するのは重" +"要です。一般的には、スピードの速い順に並べることになる (例えば、CD-ROM に続い" +"てローカルネットワークのホスト、さらに続いて彼方のインターネットホスト) で" +"しょう。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:111 +msgid "Some examples:" +msgstr "例:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:113 +#, no-wrap +msgid "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " +msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:119 +msgid "URI specification" +msgstr "URI の仕様" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:124 +msgid "file" +msgstr "ファイル" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:126 +msgid "" +"The file scheme allows an arbitrary directory in the file system to be " +"considered an archive. This is useful for NFS mounts and local mirrors or " +"archives." +msgstr "" +"file スキームは、システム内の任意のディレクトリを、アーカイブとして扱えるよう" +"にします。これは NFS マウントやローカルミラーで便利です。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:133 +msgid "" +"The cdrom scheme allows APT to use a local CDROM drive with media swapping. " +"Use the &apt-cdrom; program to create cdrom entries in the source list." +msgstr "" +"cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え" +"るようにします。取得元リストに cdrom エントリを追加するには、&apt-cdrom; プロ" +"グラムを使用してください。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:140 +msgid "" +"The http scheme specifies an HTTP server for the archive. If an environment " +"variable <envar>http_proxy</envar> is set with the format http://server:" +"port/, the proxy server specified in <envar>http_proxy</envar> will be used. " +"Users of authenticated HTTP/1.1 proxies may use a string of the format " +"http://user:pass@server:port/ Note that this is an insecure method of " +"authentication." +msgstr "" +"http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 " +"<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されていれ" +"ば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユーザ認" +"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ と言う形で" +"指定してください。この認証方法は安全ではないことに注意してください。" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:151 +msgid "" +"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " +"is highly configurable; for more information see the &apt-conf; manual page. " +"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</" +"envar> environment variable. It is possible to specify a http proxy (http " +"proxy servers often understand ftp urls) using this method and ONLY this " +"method. ftp proxies using http specified in the configuration file will be " +"ignored." +msgstr "" +"ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い" +"は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧ください。" +"ftp プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することにご注意くださ" +"い。この方法用に、さらにこの方法でしか使用しないのに、http プロキシを使用する" +"ことができます (http プロキシサーバは大抵 ftp urlも理解できます)。設定ファイ" +"ルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視され" +"ます。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:160 +msgid "copy" +msgstr "copy" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:162 +msgid "" +"The copy scheme is identical to the file scheme except that packages are " +"copied into the cache directory instead of used directly at their location. " +"This is useful for people using a zip disk to copy files around with APT." +msgstr "" +"copy スキームは、file スキームと同様ですが、パッケージをその場で使用せず、" +"キャッシュディレクトリにコピーするところが違います。zip ディスクを使用してい" +"て、APT でコピーを行う場合に便利です。" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:167 +msgid "rsh" +msgstr "rsh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:167 +msgid "ssh" +msgstr "ssh" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:169 +msgid "" +"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " +"user and access the files. It is a good idea to do prior arrangements with " +"RSA keys or rhosts. Access to files on the remote uses standard " +"<command>find</command> and <command>dd</command> commands to perform the " +"file transfers from the remote." +msgstr "" +"rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、ファイルにアク" +"セスするのに rsh/ssh を使用します。あらかじめ RSA キーや rhosts の配置してお" +"くと良いでしょう。リモートホストのファイルへのアクセスの際、ファイル転送に標" +"準の <command>find</command> コマンドや <command>dd</command> コマンドを使用" +"します。" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:121 +msgid "" +"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " +"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"現在認識する URI タイプは、cdrom, file, http, ftp, copy, ssh, rsh です。" +"<placeholder type=\"variablelist\" id=\"0\"/>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:181 +msgid "" +"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " +"stable/main, stable/contrib, and stable/non-free." +msgstr "" +"/home/jason/debian に格納されている stable/main, stable/contrib, stable/non-" +"free 用のローカル (または NFS) アーカイブを使用します。" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:183 +#, no-wrap +msgid "deb file:/home/jason/debian stable main contrib non-free" +msgstr "deb file:/home/jason/debian stable main contrib non-free" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:185 +msgid "As above, except this uses the unstable (development) distribution." +msgstr "上記同様ですが、不安定版 (開発版) を使用します。" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:186 +#, no-wrap +msgid "deb file:/home/jason/debian unstable main contrib non-free" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:188 +msgid "Source line for the above" +msgstr "上記のソース行" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:189 +#, no-wrap +msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:191 +msgid "" +"Uses HTTP to access the archive at archive.debian.org, and uses only the " +"hamm/main area." +msgstr "" +"archive.debian.org のアーカイブに HTTP アクセスし、hamm/main のみを使用しま" +"す。" + +# type: <example></example> +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:193 +#, no-wrap +msgid "deb http://archive.debian.org/debian-archive hamm main" +msgstr "deb http://archive.debian.org/debian-archive hamm main" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:195 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the stable/contrib area." +msgstr "" +"ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の " +"stable/contrib のみを使用します。" + +# type: <example></example> +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:197 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:199 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the unstable/contrib area. If this line appears as " +"well as the one in the previous example in <filename>sources.list</" +"filename>. a single FTP session will be used for both resource lines." +msgstr "" +"ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の " +"unstable/contrib を使用します。<filename>sources.list</filename> に上記サンプ" +"ルと一緒に指定された場合、両方のリソース行に対応する FTP セッションはひとつだ" +"けになります。" + +# type: <example></example> +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:203 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:205 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory." +msgstr "" +"nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクトリ以" +"下を使用します。" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:207 +#, no-wrap +msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:216 +#, no-wrap +msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:209 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory, and uses only files found under <filename>unstable/binary-i386</" +"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on " +"m68k, and so forth for other supported architectures. [Note this example " +"only illustrates how to use the substitution variable; non-us is no longer " +"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"nonus.debian.org のアーカイブに HTTP アクセスし、debian-non-US ディレクトリ以" +"下を使用します。また、i386 マシンでは <filename>unstable/binary-i386</" +"filename> 以下にあるファイル、m68k マシンでは <filename>unstable/binary-" +"m68k</filename> 以下にあるファイル、その他サポートするアーキテクチャごとの" +"ファイルのみ使用します。[このサンプルは変数展開の使用法の説明でしかないことに" +"注意してください。non-us はこのような構造になっていません] <placeholder type=" +"\"literallayout\" id=\"0\"/>" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:221 +msgid "&apt-cache; &apt-conf;" +msgstr "&apt-cache; &apt-conf;" + +# type: <author></author> +#~ msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>" +#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>" + +# type: <copyrightsummary></copyrightsummary> +#~ msgid "Copyright © Jason Gunthorpe, 1997-1998." +#~ msgstr "Copyright © Jason Gunthorpe, 1997-1998." + +# type: Content of: <refentry><refsect1><title> +#~ msgid "Introduction" +#~ msgstr "はじめに" + +# type: Content of: <refentry><refnamediv><refpurpose> +#, fuzzy +#~ msgid "Note on Pointer access" +#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作" + +# type: <example></example> +#~ msgid "" +#~ " void *Map = mmap(...);\n" +#~ " Package *PkgList = (Package *)Map;\n" +#~ " Header *Head = (Header *)Map;\n" +#~ " char *Strings = (char *)Map;\n" +#~ " cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl;" +#~ msgstr "" +#~ " void *Map = mmap(...);\n" +#~ " Package *PkgList = (Package *)Map;\n" +#~ " Header *Head = (Header *)Map;\n" +#~ " char *Strings = (char *)Map;\n" +#~ " cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl;" + +# type: <heading></heading> +#~ msgid "Structures" +#~ msgstr "構造" + +# type: <heading></heading> +#~ msgid "Header" +#~ msgstr "ヘッダ" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#, fuzzy +#~ msgid "This is the first item in the file." +#~ msgstr "ファイル一覧ファイルを指定します。" + +# type: <example></example> +#~ msgid "" +#~ " struct Header\n" +#~ " {\n" +#~ " // Signature information\n" +#~ " unsigned long Signature;\n" +#~ " short MajorVersion;\n" +#~ " short MinorVersion;\n" +#~ " bool Dirty;\n" +#~ " \n" +#~ " // Size of structure values\n" +#~ " unsigned short HeaderSz;\n" +#~ " unsigned short PackageSz;\n" +#~ " unsigned short PackageFileSz;\n" +#~ " unsigned short VersionSz;\n" +#~ " unsigned short DependencySz;\n" +#~ " unsigned short ProvidesSz;\n" +#~ " unsigned short VerFileSz;\n" +#~ " \n" +#~ " // Structure counts\n" +#~ " unsigned long PackageCount;\n" +#~ " unsigned long VersionCount;\n" +#~ " unsigned long DependsCount;\n" +#~ " unsigned long PackageFileCount;\n" +#~ " \n" +#~ " // Offsets\n" +#~ " unsigned long FileList; // PackageFile\n" +#~ " unsigned long StringList; // StringItem\n" +#~ " unsigned long VerSysName; // StringTable\n" +#~ " unsigned long Architecture; // StringTable\n" +#~ " unsigned long MaxVerFileSize;\n" +#~ " \n" +#~ " // Allocation pools\n" +#~ " struct\n" +#~ " {\n" +#~ " unsigned long ItemSize;\n" +#~ "\t unsigned long Start;\n" +#~ "\t unsigned long Count;\n" +#~ " } Pools[7];\n" +#~ "\n" +#~ " // Package name lookup\n" +#~ " unsigned long HashTable[2*1024]; // Package\n" +#~ " };" +#~ msgstr "" +#~ " struct Header\n" +#~ " {\n" +#~ " // Signature information\n" +#~ " unsigned long Signature;\n" +#~ " short MajorVersion;\n" +#~ " short MinorVersion;\n" +#~ " bool Dirty;\n" +#~ " \n" +#~ " // Size of structure values\n" +#~ " unsigned short HeaderSz;\n" +#~ " unsigned short PackageSz;\n" +#~ " unsigned short PackageFileSz;\n" +#~ " unsigned short VersionSz;\n" +#~ " unsigned short DependencySz;\n" +#~ " unsigned short ProvidesSz;\n" +#~ " unsigned short VerFileSz;\n" +#~ " \n" +#~ " // Structure counts\n" +#~ " unsigned long PackageCount;\n" +#~ " unsigned long VersionCount;\n" +#~ " unsigned long DependsCount;\n" +#~ " unsigned long PackageFileCount;\n" +#~ " \n" +#~ " // Offsets\n" +#~ " unsigned long FileList; // PackageFile\n" +#~ " unsigned long StringList; // StringItem\n" +#~ " unsigned long VerSysName; // StringTable\n" +#~ " unsigned long Architecture; // StringTable\n" +#~ " unsigned long MaxVerFileSize;\n" +#~ " \n" +#~ " // Allocation pools\n" +#~ " struct\n" +#~ " {\n" +#~ " unsigned long ItemSize;\n" +#~ "\t unsigned long Start;\n" +#~ "\t unsigned long Count;\n" +#~ " } Pools[7];\n" +#~ "\n" +#~ " // Package name lookup\n" +#~ " unsigned long HashTable[2*1024]; // Package\n" +#~ " };" + +# type: <tag></tag> +#~ msgid "Signature" +#~ msgstr "Signature" + +# type: <tag></tag> +#~ msgid "MajorVersion" +#~ msgstr "MajorVersion" + +# type: <tag></tag> +#~ msgid "MinorVersion" +#~ msgstr "MinorVersion" + +# type: <tag></tag> +#~ msgid "Dirty" +#~ msgstr "Dirty" + +# type: <tag></tag> +#~ msgid "HeaderSz" +#~ msgstr "HeaderSz" + +# type: <tag></tag> +#~ msgid "PackageSz" +#~ msgstr "PackageSz" + +# type: <tag></tag> +#~ msgid "PackageFileSz" +#~ msgstr "PackageFileSz" + +# type: <tag></tag> +#~ msgid "VersionSz" +#~ msgstr "VersionSz" + +# type: <tag></tag> +#~ msgid "DependencySz" +#~ msgstr "DependencySz" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "VerFileSz" +#~ msgstr "VerFileSz" + +# type: <tag></tag> +#~ msgid "ProvidesSz" +#~ msgstr "ProvidesSz" + +# type: <tag></tag> +#, fuzzy +#~ msgid "PackageCount" +#~ msgstr "PackageFileCount" + +# type: <tag></tag> +#~ msgid "VersionCount" +#~ msgstr "VersionCount" + +# type: <tag></tag> +#~ msgid "DependsCount" +#~ msgstr "DependsCount" + +# type: <tag></tag> +#~ msgid "PackageFileCount" +#~ msgstr "PackageFileCount" + +# type: <tag></tag> +#~ msgid "VerSysName" +#~ msgstr "VerSysName" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "MaxVerFileSize" +#~ msgstr "MaxVerFileSize" + +# type: <tag></tag> +#~ msgid "StringList" +#~ msgstr "StringList" + +# type: <tag></tag> +#~ msgid "Pools" +#~ msgstr "Pools" + +# type: <tag></tag> +#~ msgid "HashTable" +#~ msgstr "HashTable" + +# type: <tag></tag> +#, fuzzy +#~ msgid "Package" +#~ msgstr "Packages" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Name" +#~ msgstr "ファイル" + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#, fuzzy +#~ msgid "Name of the package." +#~ msgstr "パッケージ名" + +# type: <tag></tag> +#~ msgid "VersionList" +#~ msgstr "VersionList" + +# type: <tag></tag> +#~ msgid "CurrentVer" +#~ msgstr "CurrentVer" + +# type: Content of: <refentry><refsect1><refsect2><title> +#, fuzzy +#~ msgid "Section" +#~ msgstr "Sections" + +# type: <tag></tag> +#~ msgid "NextPackage" +#~ msgstr "NextPackage" + +# type: <tag></tag> +#~ msgid "RevDepends" +#~ msgstr "RevDepends" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "ProvidesList" +#~ msgstr "ファイル" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "SelectedState" +#~ msgstr "DSelect での APT" + +# type: <tag></tag> +#~ msgid "InstState" +#~ msgstr "InstState" + +# type: <tag></tag> +#~ msgid "CurrentState" +#~ msgstr "CurrentState" + +# type: <tag></tag> +#~ msgid "ID" +#~ msgstr "ID" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Flags" +#~ msgstr "ファイル" + +# type: <tag></tag> +#, fuzzy +#~ msgid "PackageFile" +#~ msgstr "PackageFileSz" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "FileName" +#~ msgstr "ファイル" + +# type: <tag></tag> +#, fuzzy +#~ msgid "Archive" +#~ msgstr "ArchiveDir" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Component" +#~ msgstr "コメント" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Version" +#~ msgstr "オプション" + +# type: <tag></tag> +#~ msgid "Origin" +#~ msgstr "Origin" + +# type: <tag></tag> +#~ msgid "Label" +#~ msgstr "Label" + +# type: <tag></tag> +#~ msgid "NotAutomatic" +#~ msgstr "NotAutomatic" + +# type: <tag></tag> +#~ msgid "Site" +#~ msgstr "Site" + +# type: <tag></tag> +#~ msgid "IndexType" +#~ msgstr "IndexType" + +# type: <tag></tag> +#~ msgid "Size" +#~ msgstr "Size" + +# type: <tag></tag> +#~ msgid "mtime" +#~ msgstr "mtime" + +# type: <tag></tag> +#~ msgid "VerStr" +#~ msgstr "VerStr" + +# type: <tag></tag> +#~ msgid "Arch" +#~ msgstr "Arch" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "NextVer" +#~ msgstr "ファイル" + +# type: <tag></tag> +#~ msgid "DependsList" +#~ msgstr "DependsList" + +# type: <tag></tag> +#, fuzzy +#~ msgid "ParentPkg" +#~ msgstr "ParentVer" + +# type: <tag></tag> +#~ msgid "InstalledSize" +#~ msgstr "InstalledSize" + +# type: <tag></tag> +#~ msgid "Hash" +#~ msgstr "Hash" + +# type: <tag></tag> +#, fuzzy +#~ msgid "Priority" +#~ msgstr "priority 100" + +# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#, fuzzy +#~ msgid "This is the parsed priority value of the package." +#~ msgstr "ファイル一覧ファイルを指定します。" + +# type: <tag></tag> +#, fuzzy +#~ msgid "Dependency" +#~ msgstr "DependencySz" + +# type: <tag></tag> +#~ msgid "NextDepends" +#~ msgstr "NextDepends" + +# type: <tag></tag> +#~ msgid "NextRevDepends" +#~ msgstr "NextRevDepends" + +# type: <tag></tag> +#~ msgid "ParentVer" +#~ msgstr "ParentVer" + +# type: <tag></tag> +#~ msgid "Type" +#~ msgstr "Type" + +# type: <tag></tag> +#~ msgid "CompareOp" +#~ msgstr "CompareOp" + +# type: <tag></tag> +#, fuzzy +#~ msgid "Provides" +#~ msgstr "ProvidesSz" + +# type: <tag></tag> +#~ msgid "ProvideVersion" +#~ msgstr "ProvideVersion" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "NextProvides" +#~ msgstr "ファイル" + +# type: <tag></tag> +#~ msgid "NextPkgProv" +#~ msgstr "NextPkgProv" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "VerFile" +#~ msgstr "ファイル" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "File" +#~ msgstr "ファイル" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "NextFile" +#~ msgstr "ファイル" + +# type: <tag></tag> +#~ msgid "Offset" +#~ msgstr "Offset" + +# type: Content of: <refentry><refsect1><refsect2><title> +#, fuzzy +#~ msgid "StringItem" +#~ msgstr "安定版の追跡" + +# type: Content of: <refentry><refsect1><refsect2><title> +#, fuzzy +#~ msgid "String" +#~ msgstr "安定版の追跡" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "NextItem" +#~ msgstr "ファイル" + +# type: Content of: <refentry><refsect1><refsect2><title> +#, fuzzy +#~ msgid "StringTable" +#~ msgstr "安定版の追跡" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Defines" +#~ msgstr "finger" + +# type: Content of: <refentry><refsect1><refsect2><title> +#, fuzzy +#~ msgid "Future Directions" +#~ msgstr "Dir セクション" + +# type: <author></author> +#, fuzzy +#~ msgid "<name>Manoj Srivastava</name><email>srivasta@debian.org</email>" +#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Procedural description" +#~ msgstr "説明" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Set Options" +#~ msgstr "オプション" + +#, fuzzy +#~ msgid "Updates" +#~ msgstr "update" + +# type: Content of: <refentry><refsect1><refsect2><title> +#, fuzzy +#~ msgid "Selection" +#~ msgstr "Dir セクション" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Action" +#~ msgstr "オプション" + +# type: Content of: <refentry><refnamediv><refpurpose> +#, fuzzy +#~ msgid "Modules and interfaces" +#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作" + +# type: <tag></tag> +#~ msgid "pdate Module" +#~ msgstr "pdate モジュール" + +# type: <tag></tag> +#, fuzzy +#~ msgid "FTP methods" +#~ msgstr "メソッド" + +# type: <tag></tag> +#~ msgid "Dependency module" +#~ msgstr "依存関係モジュール" + +#, fuzzy +#~ msgid "Event generator" +#~ msgstr "generate" + +# type: <author></author> +#, fuzzy +#~ msgid "<name>Tom Lees </name><email>tom@lpsg.demon.co.uk</email>" +#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>" + +# type: <copyrightsummary></copyrightsummary> +#, fuzzy +#~ msgid "Copyright © Tom Lees, 1997." +#~ msgstr "Copyright © Jason Gunthorpe, 1999." + +# type: Content of: <refentry><refsect1><para> +#, fuzzy +#~ msgid "The exact format for the \"Status:\" field is:" +#~ msgstr "メンテナフィールドは一般的には、" + +# type: <tag></tag> +#, fuzzy +#~ msgid "not-installed" +#~ msgstr "Clean-Installed" + +# type: <tag></tag> +#~ msgid "unpacked" +#~ msgstr "展開済み" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "half-configured" +#~ msgstr "half-configured" + +# type: <tag></tag> +#, fuzzy +#~ msgid "installed" +#~ msgstr "install" + +# type: <tag></tag> +#, fuzzy +#~ msgid "half-installed" +#~ msgstr "Clean-Installed" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "config-files" +#~ msgstr "config-files" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "post-inst-failed" +#~ msgstr "オプション" + +#, fuzzy +#~ msgid "removal-failed" +#~ msgstr "remove" + +# type: Content of: <refentry><refnamediv><refpurpose> +#, fuzzy +#~ msgid "\"Documented\" command-line interfaces" +#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "ldconfig" +#~ msgstr "ldconfig" + +# type: <tag></tag> +#, fuzzy +#~ msgid "install-info" +#~ msgstr "install" + +#, fuzzy +#~ msgid "update-rc.d" +#~ msgstr "update" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Assertions" +#~ msgstr "オプション" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "APT Files" +#~ msgstr "APT ファイル" + +# type: <copyrightsummary></copyrightsummary> +#, fuzzy +#~ msgid "Copyright © Jason Gunthorpe, 1998-1999." +#~ msgstr "Copyright © Jason Gunthorpe, 1997-1998." + +#, fuzzy +#~ msgid "General" +#~ msgstr "generate" + +#, fuzzy +#~ msgid "" +#~ "deb <var>uri</var> <var>distribution</var> <var>component</var> " +#~ "[<var>component</var> ...]" +#~ msgstr "deb uri distribution [component1] [component2] [...]" + +# type: <example></example> +#, fuzzy +#~ msgid " http://www.debian.org/archive" +#~ msgstr "deb http://archive.debian.org/debian-archive hamm main" + +# type: <example></example> +#, fuzzy +#~ msgid " ftp://ftp.debian.org/debian" +#~ msgstr "deb ftp://ftp.debian.org/debian stable contrib" + +# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#, fuzzy +#~ msgid "" +#~ "The file scheme allows an arbitrary directory in the file system to be " +#~ "considered as a debian archive. This is useful for NFS mounts and local " +#~ "mirrors/archives." +#~ msgstr "" +#~ "file スキームは、システム内の任意のディレクトリを、アーカイブとして扱える" +#~ "ようにします。これは NFS マウントやローカルミラーで便利です。" + +# type: <example></example> +#~ msgid " file:/var/debian" +#~ msgstr " file:/var/debian" + +# type: <tag></tag> +#~ msgid "smb" +#~ msgstr "smb" + +# type: <tag></tag> +#~ msgid "X-Auto" +#~ msgstr "X-Auto" + +# type: <tag></tag> +#~ msgid "X-TargetDist" +#~ msgstr "X-TargetDist" + +# type: <tag></tag> +#~ msgid "X-TargetVersion" +#~ msgstr "X-TargetVersion" + +# type: <tag></tag> +#~ msgid "Archive-[access]" +#~ msgstr "Archive-[access]" + +# type: <tag></tag> +#~ msgid "WWW-[access]" +#~ msgstr "WWW-[access]" + +# type: <tag></tag> +#~ msgid "CDImage-[access]" +#~ msgstr "CDImage-[access]" + +# type: <tag></tag> +#~ msgid "Incoming-[access]" +#~ msgstr "Incoming-[access]" + +# type: <tag></tag> +#~ msgid "nonUS-[access]" +#~ msgstr "nonUS-[access]" + +# type: Content of: <refentry><refsect1><para> +#~ msgid "This is the email address of the maintainer of the mirror." +#~ msgstr "ミラーサイトの管理者のメールアドレスです。" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "Location" +#~ msgstr "場所" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "Comment" +#~ msgstr "コメント" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "The Release File" +#~ msgstr "ソースオーバーライドファイル" + +# type: <copyrightsummary></copyrightsummary> +#, fuzzy +#~ msgid "Copyright © Jason Gunthorpe, 1998." +#~ msgstr "Copyright © Jason Gunthorpe, 1999." + +# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#, fuzzy +#~ msgid "Anatomy of the Package System" +#~ msgstr "パッケージ名" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "DSelect" +#~ msgstr "DSelect" + +# type: <tag></tag> +#, fuzzy +#~ msgid "The Extra Package list" +#~ msgstr "NextPackage" + +# type: <heading></heading> +#~ msgid "Dpkg" +#~ msgstr "Dpkg" + +# type: <tag></tag> +#, fuzzy +#~ msgid "APT Method Interface" +#~ msgstr "メソッドインスタンス" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "Global configuration" +#~ msgstr "共通設定" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "archive file" +#~ msgstr "sources.list" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "source file" +#~ msgstr "sources.list" + +# type: <tag></tag> +#~ msgid "URI" +#~ msgstr "URI" + +# type: <tag></tag> +#~ msgid "method" +#~ msgstr "メソッド" + +# type: <tag></tag> +#~ msgid "method instance" +#~ msgstr "メソッドインスタンス" + +# type: Content of: <refentry><refsect1><title> +#~ msgid "Specification" +#~ msgstr "仕様" + +#, fuzzy +#~ msgid "Overview" +#~ msgstr "OverrideDir" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#, fuzzy +#~ msgid "601 Configuration - Sends the configuration space" +#~ msgstr "設定箇所の内容を表示するだけです。" + +# type: <heading></heading> +#, fuzzy +#~ msgid "Header Fields" +#~ msgstr "ヘッダ" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Filename" +#~ msgstr "ファイル" + +# type: <tag></tag> +#~ msgid "IMS-Hit" +#~ msgstr "IMS-Hit" + +# type: <tag></tag> +#~ msgid "MD5-Hash" +#~ msgstr "MD5-Hash" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Fail" +#~ msgstr "ファイル" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Operation failed" +#~ msgstr "オプション" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "Config-Item" +#~ msgstr "config-files" + +# type: <tag></tag> +#, fuzzy +#~ msgid "Single-Instance" +#~ msgstr "Clean-Installed" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Local" +#~ msgstr "オプション" + +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "Send-Config" +#~ msgstr "ldconfig" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Send configuration to the method." +#~ msgstr "ユーザの設定" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "Version string for the method" +#~ msgstr "ユーザの設定" + +# type: Content of: <refentry><refsect1><title> +#, fuzzy +#~ msgid "601 Configuration" +#~ msgstr "ユーザの設定" + +#, fuzzy +#~ msgid "Notes" +#~ msgstr "contents" + +# type: <title> +#~ msgid "Using APT Offline" +#~ msgstr "オフラインでの APT の使用法" + +# type: +#~ msgid "" +#~ "This document describes how to use APT in a non-networked environment, " +#~ "specifically a 'sneaker-net' approach for performing upgrades." +#~ msgstr "" +#~ "このドキュメントはネットワークがない環境での APT の使用方法を説明していま" +#~ "す。具体的には、アップグレード時に「スニーカーネット」アプローチです。" + +# type: +#~ msgid "Copyright © Jason Gunthorpe, 1999." +#~ msgstr "Copyright © Jason Gunthorpe, 1999." + +# type: +#, fuzzy +#~ msgid "Using APT on both machines" +#~ msgstr "オフラインでの APT の使用法" + +# type: +#~ msgid "" +#~ " /disc/\n" +#~ " archives/\n" +#~ " partial/\n" +#~ " lists/\n" +#~ " partial/\n" +#~ " status\n" +#~ " sources.list\n" +#~ " apt.conf" +#~ msgstr "" +#~ " /disc/\n" +#~ " archives/\n" +#~ " partial/\n" +#~ " lists/\n" +#~ " partial/\n" +#~ " status\n" +#~ " sources.list\n" +#~ " apt.conf" + +# type: Content of: +#, fuzzy +#~ msgid "The configuration file" +#~ msgstr "ユーザの設定" + +# type: <example></example> +#, fuzzy +#~ msgid "" +#~ " APT\n" +#~ " {\n" +#~ " /* This is not necessary if the two machines are the same arch, it " +#~ "tells\n" +#~ " the remote APT what architecture the target machine is */\n" +#~ " Architecture \"i386\";\n" +#~ " \n" +#~ " Get::Download-Only \"true\";\n" +#~ " };\n" +#~ " \n" +#~ " Dir\n" +#~ " {\n" +#~ " /* Use the disc for state information and redirect the status file " +#~ "from\n" +#~ " the /var/lib/dpkg default */\n" +#~ " State \"/disc/\";\n" +#~ " State::status \"status\";\n" +#~ "\n" +#~ " // Binary caches will be stored locally\n" +#~ " Cache::archives \"/disc/archives/\";\n" +#~ " Cache \"/tmp/\";\n" +#~ " \n" +#~ " // Location of the source list.\n" +#~ " Etc \"/disc/\";\n" +#~ " };" +#~ msgstr "" +#~ " APT\n" +#~ " {\n" +#~ " /* This is not necessary if the two machines are the same arch, it " +#~ "tells\n" +#~ " the remote APT what architecture the Debian machine is */\n" +#~ " Architecture \"i386\";\n" +#~ " \n" +#~ " Get::Download-Only \"true\";\n" +#~ " };\n" +#~ " \n" +#~ " Dir\n" +#~ " {\n" +#~ " /* Use the disc for state information and redirect the status file " +#~ "from\n" +#~ " the /var/lib/dpkg default */\n" +#~ " State \"/disc/\";\n" +#~ " State::status \"status\";\n" +#~ "\n" +#~ " // Binary caches will be stored locally\n" +#~ " Cache::archives \"/disc/archives/\";\n" +#~ " Cache \"/tmp/\";\n" +#~ " \n" +#~ " // Location of the source list.\n" +#~ " Etc \"/disc/\";\n" +#~ " };" + +# type: <example></example> +#, fuzzy +#~ msgid "" +#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n" +#~ " # apt-get update\n" +#~ " [ APT fetches the package files ]\n" +#~ " # apt-get dist-upgrade\n" +#~ " [ APT fetches all the packages needed to upgrade the target machine ]" +#~ msgstr "" +#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n" +#~ " # apt-get update\n" +#~ " [ パッケージファイルを取得します ]\n" +#~ " # apt-get dist-upgrade\n" +#~ " [ アップグレードが必要な全パッケージを取得します ]" + +# type: <example></example> +#, fuzzy +#~ msgid "" +#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n" +#~ " # apt-get check\n" +#~ " [ APT generates a local copy of the cache files ]\n" +#~ " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-" +#~ "upgrade\n" +#~ " [ Or any other APT command ]" +#~ msgstr "" +#~ " # export APT_CONFIG=\"/disc/apt.conf\"\n" +#~ " # apt-get update\n" +#~ " [ パッケージファイルを取得します ]\n" +#~ " # apt-get dist-upgrade\n" +#~ " [ アップグレードが必要な全パッケージを取得します ]" + +# type: <title> +#, fuzzy +#~ msgid "Using APT and wget" +#~ msgstr "オフラインでの APT の使用法" + +# type: Content of: +#, fuzzy +#~ msgid "Operation" +#~ msgstr "オプション" + +#~ msgid "<literal>Debug::Vendor</literal>" +#~ msgstr "<literal>Debug::Vendor</literal>" -- cgit v1.2.3-70-g09d2 From 97c17a01c7722f08e0cebf938c12a010b96220b7 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Thu, 27 Aug 2009 15:24:41 +0200 Subject: releasing version 0.7.23 --- apt-pkg/init.h | 2 +- apt-pkg/makefile | 2 +- debian/NEWS | 2 +- debian/changelog | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 165299253..44d1d107c 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -19,7 +19,7 @@ // See the makefile #define APT_PKG_MAJOR 4 #define APT_PKG_MINOR 8 -#define APT_PKG_RELEASE 0 +#define APT_PKG_RELEASE 1 extern const char *pkgVersion; extern const char *pkgLibVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 679d97e70..7816ecf0d 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -14,7 +14,7 @@ include ../buildlib/defaults.mak LIBRARY=apt-pkg LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) MAJOR=4.8 -MINOR=0 +MINOR=1 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/debian/NEWS b/debian/NEWS index 19f06793e..88f2c564e 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -apt (0.7.22.3) unstable; urgency=low +apt (0.7.23) unstable; urgency=low * Code that determines which proxy to use was changed. Now 'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority, diff --git a/debian/changelog b/debian/changelog index 1ee88f0ba..e351198c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.22.3) UNRELEASED; urgency=low +apt (0.7.23) unstable; urgency=low [ Eugene V. Lyubimkin ] * methods/{http,https,ftp}, doc/apt.conf.5.xml: @@ -51,7 +51,7 @@ apt (0.7.22.3) UNRELEASED; urgency=low * apt-pkg/indexcopy.cc: - fix a memory leak then the Release file not exists (Closes: #511556) - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 27 Aug 2009 14:15:39 +0200 + -- Michael Vogt <mvo@debian.org> Thu, 27 Aug 2009 14:44:39 +0200 apt (0.7.22.2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From b01390eaa5750f28f258308b546f398ea5d89e3c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 27 Aug 2009 15:28:28 +0200 Subject: * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages Add a bit more autodetection to the buildsystem to be able to add only half translated languages (only a few man pages, not all) and try to reduce the overhead needed to add new languages. --- buildlib/defaults.mak | 1 + buildlib/environment.mak.in | 7 +++-- buildlib/po4a_manpage.mak | 54 ++++++++++++++++++++++++++++++++++ configure.in | 6 ++++ debian/changelog | 2 ++ doc/ja/makefile | 70 ++------------------------------------------- doc/makefile | 28 ++++++++++++------ 7 files changed, 91 insertions(+), 77 deletions(-) create mode 100644 buildlib/po4a_manpage.mak (limited to 'debian') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 8c57da05b..5373ee5cf 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -83,6 +83,7 @@ PYTHON_H = $(BASE)/buildlib/python.mak COPY_H = $(BASE)/buildlib/copy.mak YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak +PO4A_MANPAGE_H = $(BASE)/buildlib/po4a_manpage.mak XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak FAIL_H = $(BASE)/buildlib/fail.mak PODOMAIN_H = $(BASE)/buildlib/podomain.mak diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index 4e47692f5..b3afca0ad 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -36,8 +36,11 @@ DOCBOOK2MAN := @DOCBOOK2MAN@ # XML for the man pages XMLTO := @XMLTO@ -# XML for the man pages -XMLTO := @XMLTO@ +# po4a for the man pages +XSLTPROC := @XSLTPROC@ + +# po4a for the man pages +PO4A := @PO4A@ # Gettext settings GMSGFMT = @GMSGFMT@ diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak new file mode 100644 index 000000000..3ea4e2cb5 --- /dev/null +++ b/buildlib/po4a_manpage.mak @@ -0,0 +1,54 @@ +# -*- make -*- + +# This handles man pages with po4a. We convert to the respective +# output in the source directory then copy over to the final dest. This +# means po4a is only needed if compiling from bzr + +# Input +# $(LC) - The language code of the translation + +# See defaults.mak for information about LOCAL + +# generate a list of accepted man page translations +SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml)) +INCLUDES = apt.ent + +# Do not use XMLTO, build the manpages directly with XSLTPROC +ifdef XSLTPROC + +STYLESHEET=./style.$(LC).xsl + +LOCAL := po4a-manpage-$(firstword $(SOURCE)) +$(LOCAL)-LIST := $(SOURCE) + +# Install generation hooks +doc: $($(LOCAL)-LIST) +veryclean: veryclean/$(LOCAL) + +$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XSLTPROC) -o $@ $(STYLESHEET) $< # why xsltproc doesn't respect the -o flag here??? + mv -f $(subst .$(LC),,$@) $@ + +# Clean rule +.PHONY: veryclean/$(LOCAL) +veryclean/$(LOCAL): + -rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \ + $(addsuffix .xml,$($(@F)-LIST)) + +HAVE_PO4A=yes +endif + +# take care of the rest +SOURCE := $(SOURCE) apt.$(LC).8 +INCLUDES := + +ifndef HAVE_PO4A +# Strip from the source list any man pages we dont have compiled already +SOURCE := $(wildcard $(SOURCE)) +endif + +# Chain to the manpage rule +ifneq ($(words $(SOURCE)),0) +include $(MANPAGE_H) +endif diff --git a/configure.in b/configure.in index 0dd1beb1a..eb3ec0426 100644 --- a/configure.in +++ b/configure.in @@ -190,6 +190,12 @@ AC_PATH_PROG(DOCBOOK2MAN,docbook2man) dnl Check for the XML tools needed to build man pages AC_PATH_PROG(XMLTO,xmlto) +dnl Check for the XSLTProc tool needed to build man pages together with po4a +AC_PATH_PROG(XSLTPROC,xsltproc) + +dnl Check for the po4a tool needed to build man pages +AC_PATH_PROG(PO4A,po4a) + dnl Check for graphviz AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) AC_PATH_PROG([DOT], [dot], []) diff --git a/debian/changelog b/debian/changelog index f978eb367..c3f9881ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ apt (0.7.22.3) unstable; urgency=low * doc/Doxyfile.in: - update file with doxygen 1.6.1 (current unstable) - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 + * buildlib/po4a_manpage.mak, doc/makefile, configure: + - simplify the makefiles needed for po4a manpages [ George Danchev ] * cmdline/apt-cache.cc: diff --git a/doc/ja/makefile b/doc/ja/makefile index da566cc96..f44bb1c0f 100644 --- a/doc/ja/makefile +++ b/doc/ja/makefile @@ -5,71 +5,7 @@ SUBDIR=doc/ja # Bring in the default rules include ../../buildlib/defaults.mak -# Do not use XMLTO, build the manpages directly with XSLTPROC -XSLTPROC=/usr/bin/xsltproc -STYLESHEET=./style.ja.xsl - - -# Man pages -SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \ - sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \ - apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \ - apt-key.ja.8 apt-secure.ja.8 apt-mark.ja.8 - -INCLUDES = apt.ent - -doc: $(SOURCE) - -clean: clean-manpages - -clean-manpages: - rm -f $(SOURCE) \ - $(patsubst %.ja.1,%.1,$(SOURCE)) \ - $(patsubst %.ja.5,%.5,$(SOURCE)) \ - $(patsubst %.ja.8,%.8,$(SOURCE)) - -$(SOURCE) :: % : %.xml $(INCLUDES) - echo Creating man page $@ - $(XSLTPROC) -o $@ $(STYLESHEET) $< - -apt-cache.ja.8:: apt-cache.8 - cp $< $@ - -apt-get.ja.8:: apt-get.8 - cp $< $@ - -apt-cdrom.ja.8:: apt-cdrom.8 - cp $< $@ - -apt.conf.ja.5:: apt.conf.5 - cp $< $@ - -apt-config.ja.8:: apt-config.8 - cp $< $@ - -sources.list.ja.5:: sources.list.5 - cp $< $@ - -apt-sortpkgs.ja.1:: apt-sortpkgs.1 - cp $< $@ - -apt-ftparchive.ja.1:: apt-ftparchive.1 - cp $< $@ - -apt_preferences.ja.5:: apt_preferences.5 - cp $< $@ - -apt-extracttemplates.ja.1:: apt-extracttemplates.1 - cp $< $@ - -apt-key.ja.8:: apt-key.8 - cp $< $@ - -apt-secure.ja.8:: apt-secure.8 - cp $< $@ - -apt-mark.ja.8:: apt-mark.8 - cp $< $@ - - +# Language Code of this translation +LC=ja +include $(PO4A_MANPAGE_H) diff --git a/doc/makefile b/doc/makefile index e12de7228..2a2663fb3 100644 --- a/doc/makefile +++ b/doc/makefile @@ -1,7 +1,7 @@ # -*- make -*- BASE=.. SUBDIR=doc -SUBDIRS= fr ja pl pt_BR es +SUBDIRS= $(dir $(wildcard */makefile)) # Bring in the default rules include ../buildlib/defaults.mak @@ -26,27 +26,39 @@ TARGET = binary include $(COPY_H) #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr -doc: po4a +doc: for dir in $(SUBDIRS); do\ $(MAKE) -C $$dir $@; \ done -.PHONY: update-po po4a -update-po: - po4a --previous --no-backups --force --no-translations po4a.conf - -clean: po4a-clean clean-subdirs +clean: clean-subdirs +veryclean: veryclean-subdirs clean-subdirs: for dir in $(SUBDIRS); do\ - $(MAKE) -C $$dir $@; \ + $(MAKE) -C $$dir clean; \ + done + +veryclean-subdirs: + for dir in $(SUBDIRS); do\ + $(MAKE) -C $$dir veryclean; \ done +ifdef PO4A +doc: po4a + +clean: po4a-clean + +.PHONY: update-po po4a +update-po: + po4a --previous --no-backups --force --no-translations po4a.conf + po4a-clean: po4a --previous --rm-backups --rm-translations po4a.conf po4a: po4a --previous --no-backups po4a.conf +endif ifdef DOXYGEN DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) ) -- cgit v1.2.3-70-g09d2 From 6abe26994fd82bef9bc357055d1dc4feee261a4d Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 28 Aug 2009 21:07:55 +0200 Subject: * apt-pkg/acquire-item.cc: - do not segfault on invalid items (closes: #544080) --- .bzr-builddeb/default.conf.orig | 2 -- apt-pkg/acquire-item.cc | 26 +++++++++++++------------- configure.in | 2 +- debian/changelog | 2 ++ 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 .bzr-builddeb/default.conf.orig (limited to 'debian') diff --git a/.bzr-builddeb/default.conf.orig b/.bzr-builddeb/default.conf.orig deleted file mode 100644 index 9c55498ce..000000000 --- a/.bzr-builddeb/default.conf.orig +++ /dev/null @@ -1,2 +0,0 @@ -[BUILDDEB] -native = true diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 94341c81a..afb3daad3 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -596,21 +596,21 @@ void pkgAcqIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) /*{{{*/ if(Desc.URI.substr(nameLen) != *t) continue; - // we want to try it with the next extension + // we want to try it with the next extension (and make sure to + // not skip over the end) t++; + if (t == types.end()) + break; - if (t != types.end()) - { - Desc.URI = Desc.URI.substr(0, nameLen) + *t; - - new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc, - ExpectedHash, string(".").append(*t)); - - Status = StatDone; - Complete = false; - Dequeue(); - return; - } + // queue new download + Desc.URI = Desc.URI.substr(0, nameLen) + *t; + new pkgAcqIndex(Owner, RealURI, Desc.Description, Desc.ShortDesc, + ExpectedHash, string(".").append(*t)); + + Status = StatDone; + Complete = false; + Dequeue(); + return; } // on decompression failure, remove bad versions in partial/ diff --git a/configure.in b/configure.in index ff11078b3..a56544c6a 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) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.22.3") +AC_DEFINE_UNQUOTED(VERSION,"0.7.23.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 5fff5fdc5..ab9457086 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ apt (0.7.23.1) UNRELEASED; urgency=low triggers-pending state. dpkg will deal with the trigger and it if does it before we trigger it, dpkg will error out (LP: #414631) + * apt-pkg/acquire-item.cc: + - do not segfault on invalid items (closes: #544080) -- Michael Vogt <mvo@debian.org> Fri, 28 Aug 2009 18:53:20 +0200 -- cgit v1.2.3-70-g09d2 From 85b6d40dc0d41cc196f05e921260a592fe0ffd94 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Fri, 28 Aug 2009 23:06:18 +0200 Subject: releasing version 0.7.23.1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ab9457086..c16b47e32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.23.1) UNRELEASED; urgency=low +apt (0.7.23.1) unstable; urgency=low [ Michael Vogt ] * apt-pkg/pkgcache.cc: @@ -9,7 +9,7 @@ apt (0.7.23.1) UNRELEASED; urgency=low * apt-pkg/acquire-item.cc: - do not segfault on invalid items (closes: #544080) - -- Michael Vogt <mvo@debian.org> Fri, 28 Aug 2009 18:53:20 +0200 + -- Michael Vogt <mvo@debian.org> Fri, 28 Aug 2009 21:53:20 +0200 apt (0.7.23) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 50c409c42a971c6e8a25cb32a87992474247834b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 4 Sep 2009 19:32:45 +0200 Subject: add a helper to easily get a vector of strings from the configuration --- apt-pkg/contrib/configuration.cc | 19 +++++++++++++++++++ apt-pkg/contrib/configuration.h | 3 +++ debian/changelog | 2 ++ 3 files changed, 24 insertions(+) (limited to 'debian') diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 48a5f0bff..b83ece3e4 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -223,6 +223,25 @@ string Configuration::FindDir(const char *Name,const char *Default) const return Res; } /*}}}*/ +// Configuration::FindVector - Find a vector of values /*{{{*/ +// --------------------------------------------------------------------- +/* Returns a vector of config values under the given item */ +vector<string> Configuration::FindVector(const char *Name) const +{ + vector<string> Vec; + const Item *Top = Lookup(Name); + if (Top == NULL) + return Vec; + + Item *I = Top->Child; + while(I != NULL) + { + Vec.push_back(I->Value); + I = I->Next; + } + return Vec; +} + /*}}}*/ // Configuration::FindI - Find an integer value /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h index 2534692a3..e2da83f5b 100644 --- a/apt-pkg/contrib/configuration.h +++ b/apt-pkg/contrib/configuration.h @@ -31,6 +31,7 @@ #include <string> +#include <vector> #include <iostream> using std::string; @@ -70,6 +71,8 @@ class Configuration string Find(const string Name,const char *Default = 0) const {return Find(Name.c_str(),Default);}; string FindFile(const char *Name,const char *Default = 0) const; string FindDir(const char *Name,const char *Default = 0) const; + std::vector<string> FindVector(const string &Name) const; + std::vector<string> FindVector(const char *Name) const; int FindI(const char *Name,int Default = 0) const; int FindI(const string Name,int Default = 0) const {return FindI(Name.c_str(),Default);}; bool FindB(const char *Name,bool Default = false) const; diff --git a/debian/changelog b/debian/changelog index 550addc92..349c95038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ apt (0.7.24) UNRELEASED; urgency=low - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages + * apt-pkg/contrib/configuration.cc: + - add a helper to easily get a vector of strings from the config -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 36fd3a5128330620bebd5897d747f5a898f1f48b Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 5 Sep 2009 18:40:28 +0200 Subject: Switch French manpages translation to po4a --- debian/changelog | 5 + doc/fr/addendum/debiandoc_fr.add | 7 + doc/fr/addendum/xml_fr.add | 7 + doc/fr/apt-cache.fr.8.xml | 474 -- doc/fr/apt-cdrom.fr.8.xml | 159 - doc/fr/apt-config.fr.8.xml | 116 - doc/fr/apt-extracttemplates.fr.1.xml | 88 - doc/fr/apt-ftparchive.fr.1.xml | 631 --- doc/fr/apt-get.fr.8.xml | 581 --- doc/fr/apt-key.fr.8.xml | 122 - doc/fr/apt-secure.fr.8.xml | 217 - doc/fr/apt-sortpkgs.fr.1.xml | 84 - doc/fr/apt.conf.fr.5.xml | 831 ---- doc/fr/apt.ent.fr | 272 -- doc/fr/apt_preferences.fr.5.xml | 581 --- doc/fr/makefile | 58 +- doc/fr/sources.list.fr.5.xml | 257 - doc/po/fr.po | 8823 ++++++++++++++++++++++++++++++++++ 18 files changed, 8845 insertions(+), 4468 deletions(-) create mode 100644 doc/fr/addendum/debiandoc_fr.add create mode 100644 doc/fr/addendum/xml_fr.add delete mode 100644 doc/fr/apt-cache.fr.8.xml delete mode 100644 doc/fr/apt-cdrom.fr.8.xml delete mode 100644 doc/fr/apt-config.fr.8.xml delete mode 100644 doc/fr/apt-extracttemplates.fr.1.xml delete mode 100644 doc/fr/apt-ftparchive.fr.1.xml delete mode 100644 doc/fr/apt-get.fr.8.xml delete mode 100644 doc/fr/apt-key.fr.8.xml delete mode 100644 doc/fr/apt-secure.fr.8.xml delete mode 100644 doc/fr/apt-sortpkgs.fr.1.xml delete mode 100644 doc/fr/apt.conf.fr.5.xml delete mode 100644 doc/fr/apt.ent.fr delete mode 100644 doc/fr/apt_preferences.fr.5.xml delete mode 100644 doc/fr/sources.list.fr.5.xml create mode 100644 doc/po/fr.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e59f169a5..48768ad88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,11 @@ apt (0.7.24) UNRELEASED; urgency=low * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages + [ Christian Perrier ] + * doc/fr/*, doc/po/fr.po: + - remove the old fr man page translation and replace it with + the new po4a-powered translation + -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 apt (0.7.23.1) unstable; urgency=low diff --git a/doc/fr/addendum/debiandoc_fr.add b/doc/fr/addendum/debiandoc_fr.add new file mode 100644 index 000000000..987b5b1f5 --- /dev/null +++ b/doc/fr/addendum/debiandoc_fr.add @@ -0,0 +1,7 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry> + <refsect1><title>Traducteurs + Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009), + Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org + + + diff --git a/doc/fr/addendum/xml_fr.add b/doc/fr/addendum/xml_fr.add new file mode 100644 index 000000000..987b5b1f5 --- /dev/null +++ b/doc/fr/addendum/xml_fr.add @@ -0,0 +1,7 @@ +PO4A-HEADER:mode=after;position=manbugs;beginboundary=^ + Traducteurs + Jérôme Marant, Philippe Batailler, Christian Perrier bubulle@debian.org (2000, 2005, 2009), + Équipe de traduction francophone de Debian debian-l10n-french@lists.debian.org + + + diff --git a/doc/fr/apt-cache.fr.8.xml b/doc/fr/apt-cache.fr.8.xml deleted file mode 100644 index 043d9ec99..000000000 --- a/doc/fr/apt-cache.fr.8.xml +++ /dev/null @@ -1,474 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 Fvrier 2004 - - - -apt-cache - 8 - - - - - apt-cache - Gestion des paquets et manipulation du cache par APT - - - - - - apt-cache - - - - - add fichier - gencaches - showpkg paquet - showsrc paquet - stats - dump - dumpavail - unmet - search regex - show paquet - depends paquet - rdepends paquet - pkgnames prefix - dotty paquet - policy paquets - madison paquets - - - - - Description - -apt-cache ralise diffrentes oprations sur le cache de paquet d' -APT. apt-cache ne manipule pas l'tat du systme mais fournit des -moyens de recherche dans les mtadonnes d'un paquet desquelles il extrait -d'intressantes informations. - - - moins que l'option ou ne soit donne, l'une -des commandes suivantes doit tre prsente. - - - add fichier(s) - -La commande add ajoute des fichiers indexant des paquets au cache des -paquets. Cela sert uniquement pour le dbogage. - - - - gencaches - -La commande gencaches fait la mme chose que -apt-get check. Elle construit les caches des sources et des paquets - partir des sources rpertories dans &sources-list; et dans -/var/lib/dpkg/status. - - - - showpkg paquet(s) - -La commande showpkg affiche des informations sur les paquets donns -en argument. Les arguments restants sont les noms de paquets. Les versions -disponibles et les dpendances inverses de chaque paquet rpertori sont -listes, ainsi que les dpendances normales pour chaque version. Les -dpendances normales d'un paquet sont constitues par les paquets dont il -dpend ; les -dpendances inverses sont les paquets qui dpendent du paquet en question. -Les dpendances normales doivent donc tre satisfaites et les dpendances -inverses n'ont pas besoin de l'tre. Ainsi, la commande -apt-cache showpkg libreadline2 donnera ce rsultat : - - -Package: libreadline2 -Versions: 2.1-12(/var/state/apt/lists/foo_Packages), -Reverse Depends: - libreadlineg2,libreadline2 - libreadline2-altdev,libreadline2 -Dependencies: -2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null)) -Provides: -2.1-12 - -Reverse Provides: - - - -On peut voir que libreadline2, version 2.1-12, dpend de libc5, ncurses3.0 ; -ces paquets doivent tre installs au pralable pour que -libreadline2 fonctionne. leur tour, libreadlineg2 et libreadline2-altdev -dpendent de libreadline2. Si libreadline2 est install, libc5 et ncurses3.0 -doivent tre installs ; libreadlineg2 et libreadline2-altdev -n'ont pas l'tre. Pour connatre le sens de la fin de chane, il est -prfrable de consulter le code source d'APT. - - - - stats - -La commande stats affiche des statistiques propos du cache. Aucun -autre argument n'est attendu. Voici les informations rapportes : - - -Total package names est le nombre de paquets trouvs dans le cache. - - - -Normal packages est le nombre de paquets simples, -ordinaires ; ces paquets tolrent une correspondance bijective entre -leur nom et le nom utilis par les autres paquets pour les qualifier comme -dpendance. La majorit des paquets appartient cette catgorie. - - - -Pure virtual packages est le nombre des paquets qui n'existent que -sous la forme d'un nom reprsentant un paquet virtuel ; ces paquets - fournissent  seulement un nom de paquet virtuel et aucun paquet -n'utilise vritablement ce nom. Par exemple, au sein du systme Debian -GNU/Linux, le nom  mail-transport-agent  est un paquet virtuel -pur ; plusieurs paquets peuvent  remplir  ce nom - mail-transport-agent , mais il -n'existe aucun paquet nomm  mail-transport-agent . - - - -Single virtual packages est le nombre de paquets virtuels qui ne -peuvent tre remplis que par un seul paquet. Par exemple, au sein du systme -Debian GNU/Linux,  X11-text-viewer  est un paquet virtuel ; -seul le paquet  xless  remplit  X11-text-viewer . - - - -Mixed virtual packages est le nombre des paquets qui remplissent un -paquet virtuel particulier ou dont le nom est un nom de paquet virtuel. -Par exemple, au sein du systme Debian GNU/Linux,  debconf  est -un paquet rel et il est aussi fourni par  debconf-tiny . - - - -Missing est le nombre de paquets rfrencs dans une -dpendance mais qui ne sont fournis par aucun paquet. Les paquets manquants -peuvent tre mis en vidence quand on n'accde pas une distribution complte -ou si un paquet (rel ou virtuel) a t sorti d'une distribution. -Habituellement on les trouve dans les champs  Conflicts . - - - -Total distinct versions est le nombre de versions de paquets trouves -dans le cache ; cette valeur est par consquent au moins gale au -nombre total de paquets. Quand on accde plus d'une distribution -( stable  et  unstable , par exemple), cette valeur -peut tre considrablement plus grande que le nombre total de paquets. - - - -Total dependencies est le nombre de relations de dpendances -dclares par tous les paquets prsents dans le cache. - - - - - - - showsrc paquet(s) - - showsrc affiche toutes les entres de paquet source qui -correspondent aux noms donns. Toutes les versions sont affiches et toutes -les entres qui dclarent que ces noms correspondent des paquets binaires. - - - - - - dump - -La commande dump affiche un court rsum sur chaque paquet du cache. -Elle est d'abord destine au dbogage. - - - - dumpavail - -La commande dumpavail affiche sur la sortie standard une liste des -paquets disponibles. Elle convient une utilisation avec &dpkg; et la -mthode &dselect; s'en sert. - - - - unmet - -La commande unmet affiche un rsum concernant toutes les -dpendances absentes dans le cache de paquets. - - - - show paquet(s) - -La commande show est semblable -dpkg --print-avail ; -elle affiche des informations sur les paquets donns en argument. - - - - search regex [ regex ... ] - -La commande search recherche l'expression rgulire donne en -argument sur tous les paquets disponibles. Elle cherche une occurrence de la -chane dans les noms de paquets et dans les descriptions puis elle affiche -le nom du paquet et sa description courte. Quand on donne l'option -, la sortie est identique show pour chaque -paquet ; l'option ne recherche pas la chane -dans les descriptions longues mais seulement dans les noms de paquets. - -On peut utiliser des arguments distincts pour indiquer des expressions -rgulires diffrentes sur lesquelles sera ralis un  et  logique. - - - - - depends paquet(s) - -La commande depends affiche la liste de toutes les dpendances -d'un paquet et la liste de tous les paquets possibles qui satisfont ces -dpendances. - - - - rdepends paquet(s) - -La commande rdepends affiche la liste de toutes les dpendances inverses -d'un paquet. - - - - pkgnames [ prefix ] - -Cette commande affiche le nom de chaque paquet du systme. Un prfixe pour -filtrer la liste des noms peut tre donn en argument. La sortie est -approprie une utilisation au sein d'une fonction complte de shell ; -elle est produite trs rapidement. On utilise au mieux cette commande avec -l'option . - - - - dotty paquet(s) - -La commande dotty prend une liste de paquets sur la ligne de commande -et affiche une sortie approprie une utilisation par la commande dotty du -paquet GraphViz. -Il en rsulte un ensemble de noeuds et d'arcs reprsentant les relations -entre les paquets. Par dfaut les paquets donns en argument suivent toutes -leurs dpendances, ce qui peut produire un graphe trs volumineux. -Pour limiter la sortie aux seuls paquets lists sur la ligne de commande, -positionnez l'option APT::Cache::GivenOnly. - - -Les noeuds rsultants ont plusieurs formes ; les paquets normaux sont -des botes, les  provides  purs sont des triangles, -les  provides  mixtes sont des diamants et les paquets manquants -sont des hexagones. Les botes oranges expriment un arrt de la rcursivit -[paquet feuille], les lignes bleues reprsentent des prdpendances et les -lignes vertes reprsentent des conflits. - - -Attention, dotty ne peut pas reprsenter des ensembles trs grands de paquets. - - - - - policy [ paquet(s) ] - - policy sert dboguer des problmes relatifs au fichier des -prfrences. Sans argument, la commande affiche la priorit de chaque source. -Sinon, elle affiche des informations prcises sur la priorit du paquet donn -en argument. - - - - madison [ paquet(s) ] - - - La commande madison d'apt-cache - cherche mimer le -format de sortie propre l'outil debian de gestion d'archives, -madison, ainsi qu'une part de ses fonctionnalits. Elle affiche les -versions disponibles d'un paquet dans un tableau. Contrairement au programme -original madison, elle n'affiche que des informations concernant -l'architecture pour laquelle Apt a lu la liste des paquets disponibles -(APT::Architecture). - - - - - - - Options - &apt-cmdblurb; - - - - -Indique le fichier servant de cache des paquets. Le cache des paquets est -le cache primaire utilis par toutes les oprations. -lment de configuration : Dir::Cache::pkgcache. - - - - - -Indique le fichier servant de cache des sources. Ce cache n'est utilis que -par gencaches ; une version des informations sur les paquets, -faite partir d'une analyse de sources distantes, est conserve. Quand le -cache des paquets est cr, le cache des sources est utilis afin d'viter -d'analyser nouveau tous les paquets. -lment de configuration : Dir::Cache::srcpkgcache. - - - - - -Mode silencieux ; produit une sortie pertinente pour l'enregistrement -dans un fichier-journal, sans afficher d'indicateur de progression. Un plus -grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous -pouvez aussi utiliser pour positionner le niveau de silence, -annulant le fichier de configuration. -lment de configuration : quiet. - - - - - -N'affiche que les dpendances importantes ; utiliser avec la commande -unmet pour n'afficher que les relations Depends et Pre-Depends. -lment de configuration : APT::Cache::Important. - - - - - -Affiche la totalit des champs d'information sur le paquet lors d'une -recherche. -lment de configuration : APT::Cache::ShowFull. - - - - - -Affiche la totalit des champs d'information pour toutes les versions -disponibles : c'est la valeur par dfaut. Pour la dsactiver, utilisez -l'option . Quand l'option -est choisie, seuls les lments de la version choisie (celle qui serait -installe) seront affichs. -Cette option concerne seulement la commande show. -lment de configuration : APT::Cache::AllVersions. - - - - - -Ralise une mise jour automatique du cache des paquets plutt que de se -servir du cache actuel. -Pour dsactiver cette option (option par dfaut), utilisez l'option -. -lment de configuration : APT::Cache::Generate. - - - - - -N'effectue une recherche que sur les noms de paquets et pas sur les -descriptions longues. -lment de configuration : APT::Cache::NamesOnly. - - - - - -Avec cette option pkgnames affiche tous les noms, les noms des -paquets virtuels et les dpendances manquantes. -lment de configuration : APT::Cache::AllNames. - - - - - -Avec cette option depends et rdepends -sont rcursives de -manire n'afficher qu'une seule fois les paquets mentionns. -lment de configuration : APT::Cache::RecurseDepends. - - - - - -Cette option limite la sortie de depends et de -rdepends -aux paquets qui sont actuellement installs. -lment de configuration : APT::Cache::Installed. - - - - &apt-commonoptions; - - - - - Fichiers - - /etc/apt/sources.list - -Emplacements o aller chercher les paquets. -lment de configuration : Dir::Etc::SourceList. - - - - &statedir;/lists/ - -Zone de stockage pour les informations qui concernent chaque ressource de -paquet spcifie dans &sources-list; -lment de configuration : Dir::State::Lists. - - - - &statedir;/lists/partial/ - -Zone de stockage pour les informations en transit. -lment de configuration : Dir::State::Lists (partial est implicite). - - - - - - - Voir aussi - - &apt-conf;, &sources-list;, &apt-get;. - - - Diagnostics - -apt-cache retourne zro aprs un droulement normal, et le nombre -dcimal 100 en cas d'erreur. - - - &manbugs; - &deux-traducteurs; - diff --git a/doc/fr/apt-cdrom.fr.8.xml b/doc/fr/apt-cdrom.fr.8.xml deleted file mode 100644 index fd2b89a5d..000000000 --- a/doc/fr/apt-cdrom.fr.8.xml +++ /dev/null @@ -1,159 +0,0 @@ - - -%aptent; - -]> - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - 14 Fvrier 2004 - - - -apt-cdrom -8 - - - - -apt-cdrom -Gestion des cdroms par APT - - - - - -apt-cdrom - - - - - -add -ident - - - - -Description - -apt-cdrom est utilis pour ajouter un nouveau cdrom la liste des -sources disponibles. apt-cdrom prend soin de dterminer la structure -du disque, de corriger de possibles erreurs de gravure et de vrifier les -fichiers d'index. - -Il est ncessaire d'utiliser apt-cdrom pour ajouter des cdroms au -systme APT, cela ne peut tre ralis   la main . Par ailleurs, -chaque disque d'un ensemble de cdroms doit tre sparment insr et -parcouru pour prendre en compte de possibles erreurs de gravure. - - - moins que l'option ou ne soit donne, l'une -des commandes suivantes doit tre prsente. - - -add - -La commande add est utilise pour ajouter un nouveau disque la -liste des sources. Elle dmonte le cdrom, rclame l'insertion d'un disque, -parcourt ensuite le disque et copie les fichiers d'index. Si le disque ne -possde pas de rpertoire disk/ correct, un titre descriptif -est demand. - -APT utilise un identifiant de cdrom pour reconnatre le disque qui -se trouve actuellement dans le lecteur et maintient une base de donnes de -ces identifiants dans &statedir;/cdroms.list. - - - - -ident -Un outil de dbogage pour rapporter l'identifiant du disque actuel ainsi -que le nom du fichier stock. - - - - - - - -Options -&apt-cmdblurb; - - - - -Point de montage ; spcifie l'emplacement de montage du cdrom. Ce -point de montage doit tre spcifi dans /etc/fstab et -correctement configur. -lment de configuration : Acquire::cdrom::mount. - - - - -Change le nom d'un disque ; change le nom d'un disque ou annule le nom -donn aux disques. Cette option oblige apt-cdrom demander un -nouveau nom l'utilisateur. -lment de configuration : APT::CDROM::Rename. - - - - -Pas de montage ; empche apt-cdrom de monter ou dmonter le -point de montage. lment de configuration : APT::CDROM::NoMount. - - - - -Copie rapide ; suppose que les paquets sont valides et ne vrifie pas -chaque paquet. Cette option ne devrait tre utilise que si apt-cdrom -a pralablement utilis ce disque et n'a trouv aucune erreur. -lment de configuration : APT::CDROM::Fast. - - - - -Parcours minutieux des paquets ; cette option peut tre ncessaire avec -de vieux cdroms de systmes Debian 1.1 ou 1.2 dont les fichiers Packages -sont situs dans des endroits tranges. Il faudra plus de temps pour -parcourir le CD mais tous les paquets seront reprs. - - - - - - - -Aucune modification ; ne pas modifier le fichier &sources-list; - ni les fichiers d'index. Cependant, tout est vrifi. -lment de configuration : APT::CDROM::NoAct. - - - -&apt-commonoptions; - - - -Voir aussi - - -&apt-conf;, &apt-get;, &sources-list;. - - - -Diagnostics -apt-cdrom retourne zro aprs un droulement normal, et le nombre -dcimal 100 en cas d'erreur. - - - -&manbugs; -&deux-traducteurs; - - diff --git a/doc/fr/apt-config.fr.8.xml b/doc/fr/apt-config.fr.8.xml deleted file mode 100644 index 043c58686..000000000 --- a/doc/fr/apt-config.fr.8.xml +++ /dev/null @@ -1,116 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 Fvrier 2004 - - - -apt-config -8 - - - -apt-config -Programme pour interroger la configuration de APT - - - - -apt-config - - - - -shell -dump - - - - -Description -apt-config est un programme interne utilis par diffrentes -composantes d'APT ; il offre la possibilit d'une configuration -cohrente et permet aux applications conues sous forme de script une -utilisation simple du fichier de configuration principal -/etc/apt/apt.conf. - - moins que l'option ou ne soit donne, l'une -des commandes suivantes doit tre prsente. - - - -shell - -Le terme shell est utilis pour accder aux informations de configuration -depuis un script shell. Deux arguments doivent lui tre donns ; le -premier est une variable du shell et le second une valeur de configuration -demander. -La sortie standard consiste en une liste de commandes d'assignation de shell -pour chaque valeur prsente. Dans un script shell, cette commande devrait -tre utilise comme suit : - - -OPTS="-f" -RES=`apt-config shell OPTS MyApp::Options` -eval $RES - - -La variable d'environnement du shell $OPTS sera dfinie par la valeur de -MyApp::Options ou, par dfaut, la valeur -f. - - -L'lment de configuration peut tre suivi par /[fdbi].  f  -renvoie un nom de fichier,  d  un nom de rpertoire, - b  renvoie  true  ou  false  et - i  renvoie un entier. Chacune de ses valeurs est normalise et vrifie. - - - -dump - -Affiche seulement le contenu de l'espace de configuration. - - - - - -Options -&apt-cmdblurb; - - -&apt-commonoptions; - - - - -Voir aussi - -&apt-conf; - - - -Diagnostics -apt-config retourne zro aprs un droulement normal, et le nombre -100 en cas d'erreur. - - - -&manbugs; -&deux-traducteurs; - - - diff --git a/doc/fr/apt-extracttemplates.fr.1.xml b/doc/fr/apt-extracttemplates.fr.1.xml deleted file mode 100644 index 7b548869c..000000000 --- a/doc/fr/apt-extracttemplates.fr.1.xml +++ /dev/null @@ -1,88 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 Fvrier 2004 - - - -apt-extracttemplates -1 - - - -apt-extracttemplates -Un outil pour extraire d'un paquet Debian les textes de configuration pour DebConf. - - - - -apt-extracttemplates - - -fichier - - - -Description - -Apt-extracttemplates prend un ou plusieurs paquets Debian en -argument et renvoie (dans un rpertoire temporaire) tous les scripts et -guides de configuration associs. Pour chaque paquet trait contenant des -scripts et guides de configuration, une ligne est affiche au format -suivant : - -paquet version guide-de-configuration script-de-configuration - -Les scripts et guides de configuration sont crits dans le rpertoire -temporaire indiqu par l'option ou - (APT::ExtractTemplates::TempDir) ; -les noms de fichier sont de la -forme package.template.XXXX ou package.config.XXXX. - - - -Options -&apt-cmdblurb; - - - - -Rpertoire temporaire dans lequel crire les scripts et guides de -configuration pour Debconf. -lment de configuration : APT::ExtractTemplates::TempDir. - - - -&apt-commonoptions; - - - -Voir aussi -&apt-config; - - - -Diagnostics - -apt-extracttemplates retourne zro si tout se passe bien, le nombre -100 en cas d'erreur. - - - -&manbugs; -&traducteur; - \ No newline at end of file diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml deleted file mode 100644 index 9ae6506fc..000000000 --- a/doc/fr/apt-ftparchive.fr.1.xml +++ /dev/null @@ -1,631 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 Fvrier 2004 - - - -apt-ftparchive -1 - - -apt-ftparchive -Un outil pour crer des index - - - - - -apt-ftparchive - - - - - - - - -packagescheminoverrideprfixe-de-chemin -sourcescheminoverrideprfixe-de-chemin -contents chemin -release chemin -generate fichier-de-configurationsection -clean fichier-de-configuration - - - - -Description - -apt-ftparchive est l'outil en ligne de commande qui cre les index -dont APT se sert pour accder aux sources des distributions. Un index doit -tre cr pour un site et bas sur le contenu de ce site. - -apt-ftparchive est un ensemble comprenant le programme -&dpkg-scanpackages; et toutes ses fonctionnalits via la commande -packages ; il comprend aussi un gnrateur de fichier - Contents , la commande contents, et une technique -labore pour  scripter  le processus de cration d'une archive -complte. - - -Apt-ftparchive peut utiliser lui-mme des bases de donnes binaires -pour  cacher  le contenu d'un fichier .deb ; il n'a pas -besoin de programmes extrieurs, sauf &gzip;. Lors d'une excution, il -vrifie les changements dans les fichiers et cre les fichiers compresss -voulus. - - - moins que l'option ou ne soit donne, l'une des -commandes suivantes doit tre prsente : - - -packages - -La commande packages cre un fichier  Packages  partir d'une -arborescence. Elle recherche rcursivement travers le rpertoire donn -les fichiers .deb et, pour chaque fichier trouv, envoie une entre pour ce -paquet sur la sortie standard. Cette commande est approximativement -quivalente &dpkg-scanpackages;. - - -On peut se servir de l'option pour demander un cache binaire. - - - -sources - -La commande sources cre un index des sources partir d'une -arborescence. Elle recherche rcursivement travers le rpertoire donn -les fichiers .dsc et, pour chaque fichier trouv, envoie une entre pour ce -paquet sur la sortie standard. Cette commande est approximativement -quivalente &dpkg-scansources;. - - -Quand on prcise un fichier  override , c'est un fichier source -avec une extension .src qui est recherch. On peut se servir de l'option - pour changer de fichier source d' override . - - - -contents - -La commande contents cre un fichier  Contents  partir d'une -arborescence. Elle recherche rcursivement travers le rpertoire donn -les fichiers .deb et, pour chaque fichier trouv, lit la liste des -fichiers. Elle trie la liste des fichiers correspondant des paquets et -l'envoie sur la sortie standard. Les rpertoires ne font pas partie du -rsultat. Quand un fichier appartient plusieurs paquets, une virgule -spare les paquets. - -On peut se servir de l'option pour demander un cache binaire. - - - - release - -La commande release cre un fichier Releases partir -d'un rpertoire. Elle cherche rcursivement dans ce rpertoire les -fichiers Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, -Sources.bz2, Release et md5sum.txt. Elle envoie alors un fichier Release -sur la sortie standard avec un rsum MD5 et un rsum SHA1 pour chaque -fichier. - - -La valeur des autres champs du fichier Release est tire de la valeur -correspondante dans APT::FTPArchive::Release, -p. ex. APT::FTPArchive::Release::Origin. Les champs reconnus -sont : Origin, Label, Suite, -Version, Codename, Date, -Architectures, Components, -Description. - - - - -generate - -La commande generate est conue pour tre excutable par le -programme cron et elle cre un index en suivant le fichier de configuration -donn. Le langage de configuration fournit un moyen souple de prciser -index et rpertoires aussi bien que les paramtres requis. - - - -clean - -La commande clean range les bases de donnes utilises par le -fichier de configuration en supprimant les enregistrements qui ne sont -plus ncessaires. - - - - - - -Configuration de la commande generate - -La commande generate utilise un fichier de configuration pour -dcrire l'archive qui va tre cre. Le format de ce fichier est le format -ISC classique utilis par des outils ISC comme bind 8 et dhcpd. Le fichier &apt-conf; -dcrit ce format. Il faut noter que l'analyse de ce fichier se fait -par section tandis que celle d'&apt-conf; se fait par arborescence. Cela -n'affecte que l'usage de l'tiquette de vise (scope tag). - - -Ce fichier de configuration possde quatre sections, dcrites ci-dessous. - - -La section Dir - -La section Dir dfinit les rpertoires standards o situer les -fichiers ncessaires au processus de cration. Ces rpertoires sont -prcds de chemins relatifs dfinis dans les sections suivantes de manire - produire un chemin absolu et complet. - - -ArchiveDir - -Indique la racine de l'archive FTP ; Pour une configuration Debian -classique, -c'est le rpertoire qui contient le fichier ls-LR et les noeuds -des distributions. - - -OverrideDir - -Indique l'emplacement des fichiers d' override . - - -CacheDir - -Indique l'emplacement des fichiers de cache. - - -FileListDir - -Indique l'emplacement des fichiers contenant la liste des fichiers (si on se -sert de la valeur FileList dfinie plus bas). - - - - - -La section Default - -La section Default prcise les valeurs par dfaut et les paramtres -qui contrlent la marche du gnrateur. Ces valeurs peuvent tre annules dans -d'autres sections (paramtrage par section). - - -Packages::Compress - -Indique comment sont compresss les fichiers d'index. C'est une chane qui -contient des valeurs spares par des espaces ; elle contient au moins -l'une des valeurs suivantes :  .  (pas de compression), - gzip ,  bzip2 . -Par dfaut, c'est la chane  . gzip . - - -Packages::Extensions - -Indique la liste par dfaut des extensions de fichier qui constituent des -paquets. Par dfaut, c'est  .deb . - - -Sources::Compress - -Identique Packages::Compress mais prcise comment sont compresss -les fichiers sources. - - -Sources::Extensions - -Indique la liste par dfaut des extensions de fichier qui constituent des -fichiers sources. Par dfaut, c'est  .dsc . - - -Contents::Compress - -Identique Packages::Compress mais prcise comment sont compresss -les fichiers  Contents . - - -DeLinkLimit - -Indique le nombre de kilooctets dlier (et remplacer par des liens en dur) -pour chaque excution. On s'en sert, pour chaque section, avec le paramtre -External-Links. - - -FileMode - -Indique le systme de permissions des fichiers d'index crs. Par dfaut, -c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque -utilisateur (umasq) est ignor. - - - - - -La section TreeDefault - -On indique les valeurs par dfaut particulires la section -Tree. Toutes ces variables sont des variables de -substitution ; les chanes $(DIST), -$(SECTION) et $(ARCH) sont remplaces par leur valeur respective. - - -MaxContentsChange - -Indique le nombre de kilooctets de fichiers  Contents  qui sont -crs chaque jour. Les fichiers  Contents  sont tirs au sort -selon le systme round-robin de manire que, sur -plusieurs jours, tous soient reconstruits. - - -ContentsAge - -Contrle le nombre de jours pendant lequel un fichier  Contents  -peut tre utilis sans actualisation. Quand cette limite est franchie, -le  mtime  du fichier  Contents  est mis jour. Cela -peut arriver quand un fichier est modifi sans que cela modifie le fichier - Contents  (modification par  override  par exemple). -Un dlai est permis dans l'espoir que de nouveaux  .deb  seront -installs, exigeant un nouveau  Contents . Par -dfaut ce nombre vaut 10, l'unit tant le jour. - - -Directory - -Indique la racine de l'arborescence des  .deb . Par dfaut, c'est -$(DIST)/$(SECTION)/binary-$(ARCH)/. - - - - SrcDirectory - - Indique la racine de l'arborescence des paquets source. Par dfaut, c'est - $(DIST)/$(SECTION)/source/. - - - -Packages - -Indique le fichier  Packages  cr. Par dfaut, c'est -$(DIST)/$(SECTION)/binary-$(ARCH)/Packages. - - - -Sources - -Indique le fichier  Packages  cre. Par dfaut, c'est -$(DIST)/$(SECTION)/source/Sources. - - - -InternalPrefix -Indique un prfixe de chemin ; ce prfixe fait qu'un lien symbolique sera -considr comme un lien interne plutt que comme un lien externe. Par dfaut, -c'est $(DIST)/$(SECTION)/. - - - -Contents - -Indique le fichier  Contents  cr. Par dfaut, c'est -$(DIST)/Contents-$(ARCH). Quand le paramtrage fait que -diffrents fichiers  Packages  se rfrent un seul fichier - Contents , apt-ftparchive les intgre automatiquement. - - - -Contents::Header - -Indique l'en-tte prfixer au fichier  Contents  cr. - - - -BinCacheDB - -Indique la base de donnes binaire servant de cache pour cette section. -Diffrentes sections peuvent partager cette base de donnes. - - -FileList - -Indique qu'au lieu de lire l'arborescence, apt-ftparchive doit lire -la liste de fichiers dans le fichier donn en argument. Les noms relatifs -sont prfixs par le rpertoire de l'archive. - - -SourceFileList - -Indique qu'au lieu de lire l'arborescence, apt-ftparchive doit lire -la liste de fichiers dans le fichier donn en argument. Les noms relatifs -sont prfixs par le rpertoire de l'archive. On s'en sert pour traiter les -index de sources. - - - - - - -La section Tree - -La section Tree dfinit une arborescence debian classique avec -un rpertoire de base, diffrentes sections dans ce rpertoire et -diffrentes architectures dans chaque section. Le chemin exact est dfini -par la variable de substitution Directory. - - -La section Tree accepte une tiquette de vise (scope tag) qui -dtermine la variable $(DIST) et la racine de l'arborescence -(le chemin est prfix par ArchiveDir). C'est par exemple : -dists/woody. - -Tous les paramtres dfinis dans la section TreeDefault peuvent -s'utiliser dans la section Tree ainsi que les trois nouvelles -variables suivantes. - - -Quand il excute la section Tree, apt-ftparchive -agit ainsi : - -for i in Sections do - for j in Architectures do - Generate for DIST=scope SECTION=i ARCH=j - - - - -Sections - -C'est une liste de sections spares par des espaces qui appartiennent une -distribution ; classiquement, on trouve main contrib non-free. - - - -Architectures - -C'est une liste de toutes les architectures qui appartiennent chaque -section. L'architecture spciale  source  indique que -l'arborescence est une arborescence de sources. - - - -BinOverride - -Indique le fichier binaire d' override . Ce fichier contient -des informations sur la section, la priorit et le responsable du paquet. - - - -SrcOverride - -Indique le fichier source d' override . Ce fichier -contient des informations sur la section. - - - -ExtraOverride - -Indique un autre fichier d' override  pour les binaires. - - - -SrcExtraOverride - -Indique un autre fichier d' override  pour les sources. - - - - - -La section BinDirectory - -La section bindirectory dfinit une arborescence binaire sans -structure particulire. L'tiquette de vise (scope tag) indique l'emplacement -du rpertoire binaire et le paramtrage est identique celui pour la -section Tree sans substitution de variables ou au paramtrage de -SectionArchitecture. - - -Packages - -Indique le fichier  Packages  cr. - - - -Sources - -Indique le fichier  Sources  cr. L'un des deux fichiers, -Packages ou Sources est ncessaire. - - - -Contents - -Indique le fichier  Contents  cr. - - -Binoverride - -Indique le fichier d' override  pour les binaires. - - - -SrcOverride - -Indique le fichier d' override  pour les sources. - - - -ExtraOverride - -Indique un autre fichier d' override  pour les binaires. - - - -SrcExtraOverride - -Indique un autre fichier d' override  pour les sources. - - - -BinCacheDB - -Indique une base de donnes cache. - - - -PathPrefix - -Ajoute un chemin tous les chemins crs. - - -FileList, SourceFileList - -Indique le fichier contenant la liste des fichiers. - - - - - - -Le fichier d' Override  pour les binaires. - -Le fichier d' Override  est pleinement compatible avec -&dpkg-scanpackages;. Il contient quatre champs spars par des espaces. Le -premier est le nom du paquet ; le deuxime est la priorit donner ce -paquet ; le troisime est sa section et le dernier champ est un champ -pour changer le nom du responsable de paquet. - -Le champ du responsable est de cette forme : - old [// oldn]* => new - ou simplement, - new -La premire forme permet de spcifier de vieilles adresses dans une liste (le -sparateur est la double barre oblique). Si l'une de ces deux formes est -rencontre, la valeur de new remplace la valeur du champ. La deuxime forme -remplace inconditionnellement le champ. - - - -Le fichier d' Override  pour les sources - -Le fichier d' Override  est pleinement compatible avec -&dpkg-scansources;. Il contient deux champs. Le premier est le nom du paquet -source ; le second, sa section. - - - -Le fichier supplmentaire d' Override  - -Le fichier supplmentaire d' Override  permet d'ajouter ou de -remplacer des tiquettes sur la sortie. Il possde trois colonnes : -la premire reprsente le paquet, la seconde est une tiquette et la -troisime en fin de ligne est la nouvelle valeur. - - - -Les options -&apt-cmdblurb; - - - - -Crer la somme de contrle MD5. Cette option est active par dfaut. Quand -elle est dsactive, les fichiers d'index n'ont pas les champs MD5Sum l o -c'est possible. -lment de configuration : APT::FTPArchive::MD5. - - - - - -Utiliser une base de donnes binaire pour cache. Cela n'a aucun effet sur la -commande generate. -lment de configuration : APT::FTPArchive::DB. - - - - - -Mode silencieux ; cette commande produit une sortie destine -l'enregistrement dans un fichier-journal en omettant les indicateurs de -progression. Un plus grand nombre de  q  (2 au plus) produit un -plus grand silence. -On peut aussi utiliser pour positionner le niveau de silence, -et annuler le fichier de configuration. -lment de configuration : quiet. - - - - - -Faire une dliaison. Si External-Links est activ, cette option -permet rellement la dliaison des fichiers. Par dfaut, elle est active mais -elle peut tre dsactive avec l'option . -lment de configuration : APT::FTPArchive::DeLinkAct. - - - - - -Permettre la cration d'un fichier  Contents . Quand cette option -est active et que les index sont crs sous forme de base de donnes binaire, -la liste des fichiers est aussi extraite et conserve dans la base de donnes -pour un usage futur. Avec la commande generate, cette option permet la -cration de fichiers  Contents . Par dfaut, elle est active. -lment de configuration : APT::FTPArchive::Contents. - - - - - -Indique le fichier d' override  utiliser avec la commande -sources. -lment de configuration : APT::FTPArchive::SourceOverride. - - - -N'autoriser que la lecture pour les bases de donnes de cache. -lment de configuration : APT::FTPArchive::ReadOnlyDB. - - - -&apt-commonoptions; - - - -Voir aussi -&apt-conf; - - - -Diagnostics - -apt-ftparchive retourne zro si tout se passe bien, le nombre -dcimal 100 en cas d'erreur. - - - -&manbugs; -&traducteur; - - diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml deleted file mode 100644 index c1b8552cb..000000000 --- a/doc/fr/apt-get.fr.8.xml +++ /dev/null @@ -1,581 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 Fvrier 2004 - - - -apt-get -8 - - - -apt-get -Utilitaire d'APT pour la manipulation de paquets -- interface en ligne de commande. - - - - -apt-get - - - - -update -upgrade -dselect-upgrade -install paquet -remove paquet -source paquet -build-dep paquet -check -clean -autoclean - - - - -Description - -Apt-get est l'outil en ligne de commande pour manipuler les -paquets. Il peut tre considr par l'utilisateur comme un gnrateur de -sortie pour les autres outils de la bibliothque APT. -Plusieurs interfaces utilisateur existent, comme dselect, aptitude, -synaptic, gnome-apt ou wajig. - - - moins que l'option , ou ne soit donne, l'une des -commandes suivantes doit tre prsente. - - update - -La commande update permet de resynchroniser un fichier rpertoriant -les paquets disponibles et sa source. Ces fichiers sont rcuprs aux -endroits spcifis dans /etc/apt/sources.list. Ainsi, lorsqu'on -utilise une archive Debian, cette commande rcupre les fichiers -Packages.gz et les analyse de manire rendre disponibles -les informations concernant les nouveaux paquets et les paquets mis jour. -On doit toujours excuter une commande update avant les commandes -upgrade ou dist-upgrade. Il faut savoir que l'indicateur -de progression d'ensemble n'est pas correct puisque la taille de ces fichiers -ne peut tre connue l'avance. - - - -upgrade - -La commande upgrade permet d'installer les versions les plus -rcentes de tous les paquets prsents sur le systme en utilisant les -sources numres dans /etc/apt/sources.list. Les paquets -installs dont il existe de nouvelles versions sont rcuprs et mis -niveau. En aucun cas des paquets dj installs ne sont supprims ; de -mme, des paquets qui ne sont pas dj installs ne sont ni rcuprs ni -installs. Les paquets dont de nouvelles versions ne peuvent pas tre -installes sans changer le statut d'installation d'un autre paquet sont -laisss dans leur version courante. On doit d'abord excuter la commande -update pour que apt-get connaisse -l'existence de nouvelles versions des paquets. - - - -dselect-upgrade - -dselect-upgrade est utilise conjointement avec &dselect;, l'interface -traditionnelle Debian pour la gestion des paquets. -La commande dselect-upgrade suit les modifications faites par -&dselect; dans le champ Status des paquets disponibles, et effectue -les actions ncessaires la ralisation de cet tat (par exemple, -suppression d'anciens paquets, installation de nouveaux paquets). - - - -dist-upgrade - -La commande dist-upgrade effectue la fonction upgrade en -y ajoutant une gestion intelligente des changements de dpendances dans les -nouvelles versions des paquets ; apt-get possde un systme - intelligent  de rsolution des conflits et il essaye, quand c'est -ncessaire, de mettre niveau les paquets les plus importants aux dpens -des paquets les moins importants. Le fichier /etc/apt/sources.list -contient une liste de sources o rcuprer les paquets dsirs. -Voyez aussi &apt-preferences; pour un mcanisme de remplacement des paramtres -gnraux pour certains paquets. - - - -install - -La commande install est suivie par un ou plusieurs paquets -installer. Chaque paquet est un nom de paquet ; ce n'est pas un nom de -fichier entirement dfini (par exemple, dans un systme Debian GNU/Linux, -on indiquera libc6 et non pas libc6_1.9.6-2.deb). Tous les -paquets requis par le(s) paquet(s) que l'on veut installer sont aussi -rcuprs et installs. On se sert du fichier -/etc/apt/sources.list pour localiser les paquets dsirs. Quand -un trait d'union est accol (sans espace intermdiaire) au nom d'un paquet -dj install, ce paquet est supprim. De mme on peut ajouter un signe - +  pour dsigner un paquet installer. -Cette dernire fonctionnalit peut tre utilise pour annuler les dcisions -prises par le systme de rsolution des conflits d'apt-get. - - -On peut choisir d'installer une version particulire d'un paquet en faisant -suivre son nom par un signe gal et par la version. Cette version sera -localise et l'installation sera demande. On peut aussi choisir une -distribution particulire en faisant suivre le nom du paquet par une barre -oblique et par le nom de la distribution ou de l'archive (stable, testing, -unstable). - - -Avec ces possibilits de choisir la version, de vieilles versions d'un paquet -peuvent tre installes. Il faut faire attention. - - -Enfin, le mcanisme d'&apt-preferences; permet de crer d'autres rgles pour -l'installation des paquets. - - -Quand aucun paquet ne correspond l'expression donne en argument et que cette -expression contient l'un des caractres  . ,  ?  ou - * , on considre que c'est une expression rationnelle POSIX et -elle est applique tous les paquets de la base de donnes. Tout paquet -correspondant est install (ou supprim). Notez que la comparaison est -effectue par sous-chane et  lo  correspond aussi bien - how-lo  qu'  lowest . Si vous ne le voulez pas, ancrez -l'expression par un caractre  ^  ou un caractre  $ , -ou bien crez une expression plus prcise. - - - -remove - -La commande remove est identique la commande install ; -Mais les paquets sont supprims et non pas installs. Quand un signe plus est -accol (sans espace intermdiaire) au nom du paquet, le paquet est install au lieu -d'tre supprim. - - - -source - -Avec la commande source, apt-get rcupre des paquets -sources. APT examine les paquets disponibles pour choisir le paquet source - rcuprer. Il trouve ensuite et tlcharge dans le rpertoire courant -la version la plus rcente. Les paquets source sont grs indpendamment -des paquets binaires, via les lignes de type deb-src dans le fichier -&sources-list;. On n'obtiendra probablement pas les mmes sources que celles -du paquet install ou celles du paquet qu'on pourrait installer. Si l'option - est spcifie, le paquet est compil en un binaire .deb -avec dpkg-buildpackage. Si est -spcifi, le source n'est pas dcompact. - - -De la mme faon qu'avec les paquets binaires, on peut rcuprer une version -particulire d'un paquet source en faisant suivre son nom par un signe gal -et par la version. Cela permet une comparaison exacte entre le nom du paquet -source et la version ; cela lance implicitement la commande -APT::Get::Only-Source. - - -Notez que les paquets sources ne sont pas suivis comme le sont les paquets -binaires. Ils ne sont prsents que dans le rpertoire courant et sont -semblables des sources tlchargs sous forme de tarball. - - - -build-dep - -Avec la commande build-dep, apt-get installe ou supprime des paquets -dans le but de satisfaire les dpendances de construction d'un paquet source. -Pour l'instant, dans le cas d'un paquet virtuel, un paquet est choisi au -hasard. - - -check - -La commande check est un outil de diagnostic ; il met jour -le cache des paquets et cherche des dpendances dfectueuses. - - - -clean - -La commande clean nettoie le rfrentiel local des paquets -rcuprs. Il supprime tout, except le fichier lock situ dans -&cachedir;/archives/ et &cachedir;/archives/partial/. -Quand APT est utilis comme mode de &dselect;, clean est effectu -automatiquement. Quand on n'utilise pas dselect, il faut excuter -apt-get clean de temps en temps si l'on veut librer de l'espace -disque. - - - -autoclean - -Tout comme clean, autoclean nettoie le rfrentiel local -des paquets rcuprs. La diffrence est qu'il supprime uniquement les paquets -qui ne peuvent plus tre tlchargs et qui sont grandement inutiles. -On peut ainsi contrler la taille de ce cache sur une longue priode. -Tant qu'elle n'est pas active, l'option de configuration -APT::Clean-Installed empche la suppression de paquets installs. - - - - -Options -&apt-cmdblurb; - - - - - -Rcupration seule ; les paquets sont rcuprs mais ne sont ni dpaquets -ni installs. lment de configuration : APT::Get::Download-Only. - - - - - -Correction ; essaye de rparer un systme dont les dpendances sont -dfectueuses. Cette option, utilise avec install ou remove, peut omettre -tout paquet de faon permettre APT de dduire une solution viable. -Chaque paquet spcifi doit compltement corriger le problme. Cette option -est quelquefois ncessaire lorsque l'on excute APT pour la premire fois ; -APT lui-mme interdit les dpendances dfectueuses dans un systme. Il est -possible que la structure de dpendances d'un systme soit tellement -corrompue qu'elle requiert une intervention manuelle (ce qui veut dire la -plupart du temps utiliser &dselect; ou dpkg --remove pour liminer -les paquets en cause). L'utilisation de cette option conjointement avec - peut produire une erreur dans certaines situations. -lment de configuration : APT::Get::Fix-Broken. - - - - - - -Ignorer les paquets manquants ; si des paquets ne peuvent tre -rcuprs, ou, aprs rcupration, ne satisfont pas au contrle d'intgrit, -cette commande met ces paquets de ct et gre le rsultat. Utiliser cette -option conjointement avec peut produire une erreur dans -certaines situations. Quand un paquet, slectionn pour une installation -(particulirement si c'est mentionn en ligne de commande), ne peut tre -rcupr, il est mis silencieusement de ct. lment de configuration : -APT::Get::Fix-Missing. - - - - - -Pas de rcupration. Le mieux est d'utiliser cette option avec - pour forcer APT n'utiliser que les .deb qu'il a -dj rcuprs. -lment de configuration : APT::Get::Download. - - - - - -Mode silencieux ; cette commande produit une sortie destine -l'enregistrement dans un fichier-journal en omettant les indicateurs de -progression. Un plus grand nombre de  q  (2 au plus) produit un -plus grand silence. -On peut aussi utiliser pour positionner le niveau de silence, -et annuler le fichier de configuration. Notez qu'un niveau de silence gal 2 -implique et vous ne devez jamais utiliser sans -l'accompagner d'un modificateur tel que , - ou  : APT pourrait excuter des actions inattendues ! -lment de configuration : quiet. - - - - - - - - - - -Simulation ; cette commande ralise une simulation des actions qui -seraient excutes mais ne modifie pas le systme. -lment de configuration : APT::Get::Simulate. - - -La simulation affiche une srie de lignes reprsentant chacune une opration -de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets encadrent -des paquets endommags et des crochets n'encadrant rien indiquent que les -dommages n'ont aucune consquence (rare). - - - - - - -Rpond automatiquement oui aux questions ; prsume  oui  -comme rponse toutes les questions et s'excute de manire non interactive. -Dans le cas d'une situation indsirable, comme le changement d'un paquet -gel, l'installation d'un paquet non authentifi ou la suppression d'un -paquet essentiel, apt-get s'interrompt. -lment de configuration : APT::Get::Assume-Yes. - - - - - -Afficher les paquets mis niveau ; affiche une liste de tous les paquets -mettre niveau. lment de configuration : APT::Get::Show-Upgraded. - - - - - -Afficher les versions compltes des paquets installs ou mis niveau. -lment de configuration : APT::Get::Show-Versions. - - - - - - -Cette commande compile un paquet source aprs l'avoir rcupr. -lment de configuration : APT::Get::Compile. - - - - - -Cette commande ignore la marque  Hold  d'un paquet ; par ce biais, -apt-get ignore un  hold  plac sur un paquet. cela peut tre utile -avec dist-upgrade pour annuler un grand nombre de  hold  -indsirables. lment de configuration : APT::Ignore-Hold. - - - - - -Aucune mise niveau ; quand elle est utilise avec install, -cette commande empche les paquets lists sur la ligne de commande d'tre mis - niveau. -lment de configuration : APT::Get::Upgrade. - - - - - -Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse -APT continuer sans poser de questions quand il ralise quelque chose de -potentiellement dommageable. Cette option ne doit tre utilise que dans des -circonstances trs spciales. Utiliser force-yes peut dtruire le systme ! -lment de configuration : APT::Get::force-yes. - - - - - -Au lieu d'aller chercher les paquets installer, leurs URI sont affiches. -Chaque URI a un chemin, un nom de fichier destination, une taille et une -cl md5 attendue. Notez que le nom de fichier afficher ne correspond pas -toujours au nom de fichier sur le site distant ! Cette option fonctionne -aussi avec la commande source et avec la commande -update. Avec la commande update, -la somme MD5 et la taille ne sont pas donnes et c'est l'utilisateur de -dcompresser les fichiers compresss. -lment de configuration : APT::Get::Print-URIs. - - - - - -Utiliser purge la place de remove pour supprimer tout ce qui peut tre -supprim. -Un astrisque (*) sera affich prs des paquets qui vont tre purgs. -lment de configuration : APT::Get::Purge. - - - - - -Rinstaller les paquets dj installs avec leur version la plus rcente. -lment de configuration : APT::Get::ReInstall. - - - - -Cette option est active par dfaut ; utilisez --no-list-cleanup -pour la dsactiver. Quand elle est active, apt-get gre -automatiquement le contenu de &statedir;/lists afin d'assurer -que les fichiers obsoltes soient effacs. La seule raison de la dsactiver -est une modification frquente de votre liste de sources. -lment de configuration : APT::Get::List-Cleanup. - - - - - - - -Cette option contrle l'entre par dfaut pour les questions de -distribution ; une tiquette (pin) par dfaut dont la priorit vaut 990 -est cr en utilisant la chane spcifie. Le fichier des prfrences peut -annuler cette dcision. En clair, cette option permet de contrler simplement -dans quelle distribution seront rcuprs les paquets. Par exemple : - ou . -lment de configuration : APT::Default-Release. -Voyez aussi la page de manuel d'&apt-preferences;. - - - - - -Ne ralise que les oprations  triviales . Logiquement ceci peut tre -considr comme relatif . Alors que - rpond oui n'importe quelle question, - rpond non. -lment de configuration : APT::Get::Trivial-Only. - - - - - -Quand des paquets doivent tre supprims, apt-get s'arrte immdiatement sans -poser de questions. lment de configuration : APT::Get::Remove. - - - - - -Cette option n'a de sens qu'avec les commandes source et -build-dep. Elle indique -que les noms de sources donns ne doivent pas tre reprs travers le -tableau des binaires. Cela signifie que si cette option est choisie, la commande -source acceptera seulement des noms de paquets source -comme argument ; elle n'acceptera pas de les rechercher partir des noms de -paquets binaires correspondants. -lment de configuration : APT::Get::Only-Source - - - - - -Ne rcuprer que le fichier diff ou tar d'une archive de source. -lment de configuration : APT::Get::Diff-Only et -APT::Get::Tar-Only. - - - - - -Ne traiter que les dpendances de construction pour telle architecture. -lment de configuration : APT::Get::Arch-Only - - - - - -Ignorer le fait que les paquets ne peuvent pas tre authentifis ; pas -d'interrogation de l'utilisateur. C'est trs utile pour certains outils - comme pbuilder -lment de configuration : -APT::Get::AllowUnauthenticated. - - - -&apt-commonoptions; - - - - -Fichiers - -/etc/apt/sources.list - -Liste les emplacements o aller chercher les paquets. -lment de configuration : Dir::Etc::SourceList. - - - -/etc/apt/apt.conf -Fichier de configuration d'APT. -lment de configuration : Dir::Etc::Main. - - - -/etc/apt/apt.conf.d/ - -lments du fichier de configuration d'APT. -lment de configuration : Dir::Etc::Parts. - - - -/etc/apt/preferences - -Fichier des prfrences. -C'est dans ce fichier qu'on peut faire de l'tiquetage (pinning) c'est--dire, -choisir d'obtenir des paquets d'une source distincte ou d'une distribution -diffrente. -lment de configuration : Dir::Etc::Preferences. - - - -&cachedir;/archives/ - -Zone de stockage pour les paquets rcuprs. -lment de configuration : Dir::Cache::Archives. - - - -&cachedir;/archives/partial/ - -Zone de stockage pour les paquets en transit. -lment de configuration : Dir::Cache::Archives (implicitement, partial). - - - -&statedir;/lists/ - -Zone de stockage des informations concernant chaque ressource spcifie dans -&sources-list;. -lment de configuration : Dir::State::Lists. - - - -&statedir;/lists/partial/ - -Zone de stockage pour les informations d'tat des paquets en transit. -lment de configuration : Dir::State::Lists (implicit partial). - - - - - -Voir aussi - -&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, - &apt-conf;, &apt-config;, - le guide  APT users guide  dans &docdir;, &apt-preferences;, -le guide APT. - - - - Diagnostic - apt-get renvoie zro aprs une opration normale, le dcimal 100 -en cas d'erreur. - - - &manbugs; -&deux-traducteurs; - diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml deleted file mode 100644 index 73a61ea41..000000000 --- a/doc/fr/apt-key.fr.8.xml +++ /dev/null @@ -1,122 +0,0 @@ - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-key - 8 - - - - - apt-key - Utilitaire de gestion des cls - - - - - - apt-key - command/ - - - - - Description - - apt-key gre les cls dont se sert apt pour -authentifier les paquets. Les paquets authentifis par ces cls seront -rputs fiables. - - - -Commandes - - add fichier - - - -Ajouter une cl la liste des cls fiables. La cl est lue dans -fichier, ou sur l'entre standard si -fichier est -. - - - - - - - del keyid - - - -Supprimer une cl de la liste des cls fiables. - - - - - - - list - - - -Afficher la liste des cls fiables. - - - - - - update - - -Mettre jour le trousseau de cls local avec le trousseau de cls de l'archive -Debian et supprimer les cls qui sont primes. - - - - - - - - Fichiers - - /etc/apt/trusted.gpg -Trousseau de cls locales fiables, les nouvelles cls sont ajoutes ici. - - - - /etc/apt/trustdb.gpg - Base de donnes locale fiable des cls de l'archive. - - - /usr/share/keyrings/debian-archive-keyring.gpg - Trousseau des cls fiables de l'archive Debian. - - - /usr/share/keyrings/debian-archive-removed-keys.gpg - - Trousseau des cls fiables supprimes de l'archive Debian. - - - - - -Voir aussi - -&apt-get;, &apt-secure; - - - - &manbugs; - &manauthor; -&traducteur; - - diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml deleted file mode 100644 index 25b5ffd09..000000000 --- a/doc/fr/apt-secure.fr.8.xml +++ /dev/null @@ -1,217 +0,0 @@ - - -%aptent; - -]> - - - &apt-docinfo; - - - apt-secure - 8 - - - - - - - - - apt-secure - Certification d'archive avec APT - - - Description - - Depuis sa version 0.6, apt sait vrifier -la signature du fichier Release de chaque archive. On s'assure ainsi que les -paquets de cette archive ne peuvent pas tre modifis par quelqu'un qui ne -possde pas la cl de la signature du fichier Release. - - - - Quand un paquet provient d'une archive sans signature ou d'une archive avec -une signature dont apt ne possde pas la cl, ce paquet n'est pas considr -comme fiable et son installation provoquera un avertissement. Pour -l'instant, apt-get ne signale que les archives sans -signature ; les prochaines versions pourraient rendre obligatoire la -vrification des sources avant tout tlchargement de paquet. - - - - Les paquets &apt-get;, &aptitude; et &synaptic; possdent cette nouvelle -fonction de certification. - - - - - Archives fiables - - - D'une archive apt jusqu' l'utilisateur, la confiance se construit en -plusieurs tapes. Apt-secure est la dernire tape. Faire -confiance une archive ne signifie pas que les paquets qu'elle contient -sont exempts de code malveillant, mais signifie que vous faites confiance au -responsable de l'archive. C'est ensuite au responsable de l'archive de faire -en sorte que l'archive soit fiable. - - - - Apt-secure n'examine pas la signature d'un -paquet. Certains programmes peuvent le faire comme -debsig-verify ou debsign, qu'on peut -trouver dans les paquets debsig-verify et devscripts. - - - - La fiabilisation dans Debian commence quand un responsable de paquet envoie -un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. Cet -envoi, pour tre effectif, doit tre sign avec la cl d'un responsable qui -se trouve dans le trousseau des responsables Debian (disponible dans le -paquet debian-keyring). Les cls des responsables de paquet sont signes par -d'autres responsables, suivant des procdures prtablies pour s'assurer de -l'identit des propritaires de la cl. - - - - - Une fois le paquet vrifi et archiv, la signature du responsable est -enleve, une somme MD5 du paquet est calcule et mise dans le fichier -Packages. Une somme MD5 de tous les paquets est ensuite calcule et mise -dans le fichier Release. Ce fichier est sign par la cl de l'archive. Cette -cl qui est cre chaque anne et distribue par le serveur FTP se trouve -aussi dans le trousseau Debian. - - - - - Un utilisateur peut consulter la signature du fichier Release, extraire la -somme MD5 d'un paquet et la comparer avec la somme du paquet qu'il a -tlcharg. Avant la version 0.6, seule la somme du paquet tlcharg tait -vrifie. Maintenant on peut vrifier aussi la signature du fichier Release. - - - - Cette faon de faire est diffrente d'une vrification de la signature d'un -paquet. Elle vise empcher deux types d'attaque possibles : - - - - - -L'attaque de type homme au milieu. Sans vrification de -signature, quelqu'un de malveillant peut s'introduire au milieu du -processus de tlchargement et insrer du code soit en contrlant un lment -du rseau, routeur, commutateur, etc. soit en dtournant le trafic vers un -serveur fourbe (par usurpation d'adresses). - - - -L'attaque par compromission d'un miroir sur le rseau. Sans vrification de -signature, quelqu'un de malveillant peut compromettre un miroir et modifier -les fichiers. Ainsi tous ceux qui tlchargent les paquets de ce miroir -propagent du code malveillant. - - - - -Cependant cette mthode ne garantit pas contre une compromission du serveur -Debian lui-mme (qui signe les paquets) ni contre la compromission de la cl -qui sert signer les fichiers Release. Mais elle peut complter la -signature des paquets. - - - - Configuration - - Le programme qui gre la liste des cls utilises par apt s'appelle -apt-key. Il peut ajouter ou supprimer des cls. Cette -version installe automatiquement les cls qui servent signer l'archive -Debian et les diffrents rpertoires de paquets. - - - - Pour ajouter une cl, vous devez d'abord la tlcharger. Il vaut mieux -utiliser un canal fiable pour ce tlchargement. Ensuite vous l'ajoutez avec -la commande apt-key et vous lancez la commande -apt-get update pour tlcharger et vrifier le fichier -Release.gpg de l'archive que vous avez configure. - - - - -Configuration d'une archive - - Si vous voulez signer les archives dont vous avez la responsabilit, vous -devez : - - - - - crer un fichier Release la racine de l'archive, s'il n'existe pas -dj. Vous pouvez le crer avec la commande apt-ftparchive release -(fournie dans le paquet apt-utils) ; - - - -le signer, avec la commande gpg -abs -o Release.gpg Release ; - - - -publier l'empreinte de la cl. Ainsi les utilisateurs de votre archive -connatront la cl qu'ils doivent importer pour authentifier les fichiers de -l'archive. - - - - - Chaque fois que le contenu de l'archive change, le responsable doit refaire -les deux premires tapes. - - - - -Voir aussi - -&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, -&debsig-verify;, &gpg; - - - -Pour des informations plus substantielles, vous pouvez consulter - -l'infrastructure debian pour la scurit un chapitre du manuel Debian sur la scurit -(disponible dans le paquet harden-doc) et le -Strong Distribution HOWTO par V. Alex Brennen. - - - - - &manbugs; - &manauthor; - -Auteurs - - -Cette page a t crite partir des travaux de Javier Fernndez-Sanguino Pea, Isaac -Jones, Colin Walters, Florian Weimer et Michael Vogt. - - -&traducteur; - - diff --git a/doc/fr/apt-sortpkgs.fr.1.xml b/doc/fr/apt-sortpkgs.fr.1.xml deleted file mode 100644 index 109a23c48..000000000 --- a/doc/fr/apt-sortpkgs.fr.1.xml +++ /dev/null @@ -1,84 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - -apt-sortpkgs -1 - - - -apt-sortpkgsUn outil pour trier les index de paquets. - - - - - -apt-sortpkgs - - - -fichier - - - -Description - -Apt-sortpkgs prend un index (un index de Source ou un index de -paquet) et trie leurs enregistrements selon le nom de paquet. Un tri des -champs de chaque enregistrement est ralis selon des rgles internes. - - - -Le rsultat est envoy sur la sortie standard ; l'entre doit tre un -fichier analysable. - - - -Options -&apt-cmdblurb; - - - - -Se servir d'un index de sources pour le tri des champs. -lment de configuration : APT::SortPkgs::Source. - - - -&apt-commonoptions; - - - -Voir aussi - -&apt-conf; - - - -Diagnostics - -apt-sortpkgs retourne zro si tout se passe bien ou 100 en cas -d'erreur. - - - -&manbugs; -&traducteur; - \ No newline at end of file diff --git a/doc/fr/apt.conf.fr.5.xml b/doc/fr/apt.conf.fr.5.xml deleted file mode 100644 index f4d8eddb8..000000000 --- a/doc/fr/apt.conf.fr.5.xml +++ /dev/null @@ -1,831 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 11 juillet 2008 - - - -apt.conf -5 - - -apt.conf -Fichier de configuration pour APT - - -Description - -Le fichier apt.conf est le principal fichier de configuration -de la collection d'outils que constitue APT ; tous les outils font appel ce -fichier de configuration et utilisent un analyseur syntaxique en ligne de -commande commun afin de fournir un environnement uniforme. Quand un outil -d'APT dmarre, il lit la configuration dsigne par variable d'environnement -APT_CONFIG (si elle existe), puis il lit les fichiers situs dans -Dir::Etc::Parts ainsi que le principal fichier de configuration -indiqu par Dir::Etc::main ; enfin il applique les options de -la ligne de commande qui prvalent sur les directives de configuration, chargeant -si ncessaire d'autres fichiers de configuration. - - -Le fichier de configuration est construit comme un arbre d'options -organises en groupes fonctionnels. On se sert du double deux points ( :: ) -pour indiquer une option ; par exemple, APT::Get::Assume-Yes est -une option pour le groupe d'outils APT, destine l'outil Get. Il n'y a pas d'hritage -des options des groupes parents. - - -Syntaxiquement, le langage de configuration est conu sur le mme modle -que les langages utiliss par des outils ISC tels que bind et dhcp. Une ligne -qui commence par // est traite comme un commentaire et ignore, de -mme que les sections de texte places entre /* et -*/, tout comme les commentaires C/C++. -Chaque ligne est de la forme : - -APT::Get::Assume-Yes "true"; - -Le point-virgule final est obligatoire et les guillemets sont optionnels. -On peut dclarer un nouveau champ d'action avec des accolades, comme -suit : - - - -APT { - Get { - Assume-Yes "true"; - Fix-Broken "true"; - }; -}; - - - -avec des retours la ligne pour faciliter la lecture. On peut crer une liste -en ouvrant un champ d'action et en y insrant une chane entre guillemets suivie -d'un point virgule pour chaque lment de la liste. - - - -DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; - - - -Les modles &docdir;examples/apt.conf et &configureindex; -montrent quoi devrait ressembler le fichier de configuration. - - -Les identifiants des options de configuration ne sont pas sensibles la casse. -Dans l'exemple prcdent, on pourrait donc aussi bien utiliser -dpkg::pre-install-pkgs. - - -Deux lments spciaux sont autoriss : #include et -#clear. #include inclut le fichier donn en -argument, moins que le nom ne se termine par une barre oblique auquel cas le -rpertoire entier est inclus. #clear sert -effacer une partie de l'arbre de configuration. L'lment dsign et tout ses -descendants sont supprims. - - -Tous les outils d'APT possdent une option qui permet de -spcifier une configuration arbitraire depuis la ligne de commande. La -syntaxe consiste en un nom complet d'option (par exemple -APT::Get::Assume-Yes) suivi par un signe gal, puis par la nouvelle -valeur de l'option. On peut complter une liste en ajoutant un  ::  au nom -de la liste. - - - -Le groupe APT - -Ce groupe d'options contrle le comportement global d'APT et contient galement -des options communes tous les outils. - - -Architecture - -L'architecture du systme ; cette option positionne l'architecture utiliser -pour rcuprer des fichiers et analyser des listes de paquets. La valeur interne par -dfaut est l'architecture pour laquelle APT a t compil. - - - -Default-Release - -Indique la distribution utiliser par dfaut lors de l'installation d'un -paquet si plusieurs versions sont disponibles. La valeur peut tre un nom de -distribution ou un numro de version. Exemples :  stable , - testing ,  4.0 ,  5.0* . Les noms de codes -des distributions ( etch ,  lenny , etc.) ne sont pas -permis pour l'instant. Voir aussi &apt-preferences;. - - - -Ignore-Hold - -Ignore les paquets  gels  ; cette option globale indique au -systme de rsolution de ne pas tenir compte des paquets  gels  -dans sa prise de dcision. - - - -Clean-Installed - -Avec cette option qui est active par dfaut, la fonctionnalit  autoclean  -supprime du cache tout paquet qui ne peut plus tre rcupr. -Quand cette option est dsactive, les paquets qui sont installs localement -sont aussi exclus du nettoyage - mais notez que APT ne fournit aucun moyen -direct pour les rinstaller. - - - -Immediate-Configure - -Dsactive la configuration immdiate ; cette dangereuse option dsactive -une partie du code de mise en ordre de APT pour que ce dernier effectue le -moins d'appels possible &dpkg;. a peut tre ncessaire sur des systmes - un seul utilisateur extrmement lents, mais cette option est trs dangereuse et -peut faire chouer les scripts d'installation, voire pire. -Utilisez-la vos risques et prils. - - - -Force-LoopBreak - -Ne jamais activer cette option moins que vous ne sachiez - rellement - ce -que vous faites. Elle autorise APT supprimer temporairement un paquet -essentiel pour mettre fin une boucle Conflicts / Conflicts ou -Conflicts / Pre-Depends entre deux paquets essentiels. UNE TELLE BOUCLE -NE DOIT JAMAIS SE PRODUIRE : C'EST UN BOGUE SRIEUX. Cette option -fonctionne si les paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash -ou tous les paquets dont ces paquets dpendent. - - - -Cache-Limit - -APT utilise un fichier de cache charg en mmoire avec mmap pour ranger les -informations sur les paquets disponibles. Cette option fixe la taille mmoire -alloue pour le chargement de ce cache. - - - -Build-Essential - - Cette option dfinit les paquets qui sont considrs comme faisant partie -des dpendances essentielles pour la construction de paquets. - - - -Get -La sous-section Get contrle l'outil &apt-get;, -veuillez consulter sa documentation pour avoir plus d'informations sur les options -en question. - - - -Cache -La sous-section Cache contrle l'outil -&apt-cache;, veuillez consulter sa documentation pour avoir plus d'informations -sur les options en question. - - - -CDROM -La sous-section CDROM contrle l'outil -&apt-cdrom;, veuillez consulter sa documentation pour avoir plus d'informations -sur les options en question. - - - - - -Le groupe Acquire - -Le groupe d'options Acquire contrle le tlchargement des paquets et -les gestionnaires d'URI. - - -PDiffs -Essayer de tlcharger les fichiers diffrentiels appels -PDiffs pour les paquets ou les fichiers sources, plutt que -de les tlcharger entirement. Par dfaut  true . - - - -Queue-Mode - -Le mode de file d'attente ; Queue-Mode peut prendre les -valeurs host ou access et cela dtermine -comment APT paralllise les connexions sortantes. Host signifie -qu'une connexion par cible sera initie, tandis que access signifie -qu'une connexion par type d'URI sera initie. - - - -Retries - -Nombre d'essais effectuer. Si ce nombre n'est pas nul, APT essaie de -rcuprer, le nombre donn de fois, les fichiers dont la rcupration a chou. - - - -Source-Symlinks - -Utilise des liens symboliques pour les archives de sources. Positionne - true , cette option cre si possible des liens symboliques vers -les archives de sources au lieu de les copier. -Par dfaut  true . - - - -http - -URI HTTP ; http::Proxy est le mandataire (proxy) HTTP utiliser par dfaut. -Il se prsente sous la forme standard : -http://[[user][:pass]@]host[:port]/. On peut spcifier un -mandataire particulier par hte distant en utilisant la syntaxe : -http::Proxy::<hte>. Le mot-cl spcial -DIRECT indique alors de n'utiliser aucun mandataire pour -l'hte. -Lorsqu'elle est dfinie, la variable d'environnement http_proxy -annule et remplace toutes les options de mandataire HTTP. - - -Trois options de configuration sont fournies pour le contrle des caches compatibles -avec HTTP/1.1. No-Cache signifie que le mandataire ne doit jamais -utiliser les rponses qu'il a stockes ; Max-Age -sert uniquement pour les fichiers d'index : cela demande au cache de les -mettre jour quand leur anciennet est suprieure au nombre de secondes -donn. Debian met jour ses fichiers d'index de manire quotidienne ; la -valeur par dfaut est donc de 1 jour. No-Store sert uniquement -pour les fichiers d'archive  et demande au cache de ne jamais garder -la requte. Cela peut viter de polluer un cache mandataire avec des -fichiers .deb trs grands. Note : Squid 2.0.2 ne prend en compte aucune de -ces options. - - -L'option timeout positionne le compteur de temps mort (timeout) -utilis par la mthode. Cela vaut pour tout, connexion et donnes. - - -Une option de configuration est fournie pour contrler 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). Acquire::http::Pipeline-Depth a une valeur -comprise entre 0 et 5 : elle indique le nombre de requtes en attente qui -peuvent tre mises. Quand la machine distante ne conserve pas correctement -les connexions TCP, on DOIT donner une valeur gale 0 -- sinon des -donnes seront corrompues. Les machines qui ont besoin de cette option -ne respectent pas la RFC 2068. - - - -https - -URI HTTPS. Les options de contrle de cache et de mandataire (proxy) sont les -mmes que pour la mthode http. L'option -Pipeline-Depth n'est pas encore supporte. - - -La sous-option CaInfo spcifie le fichier contenant -les informations sur les certificats de confiance. -La sous-option boolenne Verify-Peer prcise si le -certificat d'hte du serveur doit tre confront aux certificats de confiance -ou pas. La sous-option boolenne Verify-Host prcise s'il -faut vrifier ou pas le nom d'hte du serveur. SslCert -dtermine le certificat utiliser pour l'authentification du client. -SslKey dtermine quelle clef prive doit tre utilise pour -l'authentification du client. SslForceVersion surcharge la -valeur par dfaut pour la version de SSL utiliser et peut contenir l'une des -chanes 'TLSv1' ou 'SSLv3'. - -Chacune de ces options peut tre spcifie pour un hte particulier en -utilisant <hte>::CaInfo, -<hte>::Verify-Peer, -<hte>::Verify-Host, -<hte>::SslCert, -<hte>::SslKey et -<hte>::SslForceVersion respectivement. - - - -ftp - -URI FTP ; ftp::Proxy est le mandataire (proxy) FTP utiliser par dfaut. -Il se prsente sous la forme standard : -ftp://[[user][:pass]@]host[:port]/. On peut spcifier un -mandataire particulier par hte distant en utilisant la syntaxe : -ftp::Proxy::<hte>. Le mot-cl spcial -DIRECT indique alors de n'utiliser aucun mandataire pour -l'hte. Lorsqu'elle est dfinie, la variable d'environnement -ftp_proxy annule et replace toutes les options de mandataire -FTP. Pour utiliser un mandataire FTP, vous devrez renseigner l'entre -ftp::ProxyLogin dans le fichier de configuration. Cette -entre spcifie les commandes envoyer au mandataire pour lui prciser quoi -il doit se connecter. Voyez &configureindex; pour savoir comment faire. Les -variables de substitution disponibles sont : -$(PROXY_USER), $(PROXY_PASS), -$(SITE_USER), $(SITE_PASS), -$(SITE) et $(SITE_PORT). Chacune -correspond l'lment respectif de l'URI. - - -L'option timeout positionne le compteur de temps mort -(timeout) utilis par la mthode. Cela vaut pour tout, connexion et donnes. - - -Plusieurs options de configuration sont fournies pour contrler le mode -passif. Il est gnralement plus sr d'activer le mode passif et cela -marche dans presque tous les environnements. Cependant, certaines situations -ncessitent que le mode passif soit dsactiv et que le mode - port  de ftp -soit utilis la place. On peut le faire globalement, pour des -connexions qui passent par un mandataire ou pour une machine -spcifique (examinez le modle de fichier de configuration). - - -Il est possible de faire transiter le trafic FTP par un mandataire HTTP en -positionnant la variable d'environnement ftp_proxy une URL -HTTP -- -consultez la mthode http ci-dessus pour la syntaxe. On ne peut pas le faire -dans le fichier de configuration et il n'est de toute faon pas recommand -d'utiliser FTP au travers de HTTP en raison la faible efficacit de cette -mthode. - - -L'option ForceExtended contrle l'utilisation des commandes lies - la RFC 2428, EPSV et EPRT. Par dfaut, elle vaut - false  ce qui signifie que ces commandes ne sont -utilises que pour une connexion de type IPv6. Quand elle vaut - true , on les utilise mme si la connexion est de type IPv4. La -plupart des serveurs FTP ne suivent pas la RFC 2428. - - - -cdrom - -URI cdrom ; la seule option de configuration pour les URI de cdrom -est le point de montage : cdrom::Mount ; il doit -reprsenter le point de montage du lecteur de cdrom indiqu dans -/etc/fstab. -On peut fournir d'autres commandes de montage et de dmontage quand le -point de montage ne peut tre list dans le fichier /etc/fstab -(par exemple, un montage SMB). Syntaxiquement, il faut placer -"/cdrom/"::Mount "foo"; dans le bloc cdrom. -La barre oblique finale est importante. Les commandes de dmontage -peuvent tre spcifies en utilisant UMount. - - - - gpgv - -URI GPGV ; la seule option pour les URI GPGV est celle qui permet de - passer des paramtres gpgv. - gpgv::Options : options supplmentaires passes - gpgv. - - - - - - - -Les rpertoires - -Les rpertoires de la section Dir::State concernent le systme -local. lists est le rpertoire o placer les listes de paquets -tlchargs et status est le nom du fichier d'tat de -&dpkg;. -preferences concerne APT : c'est le nom du fichier des -prfrences. -Dir::State contient le rpertoire par dfaut prfix tous les -sous-lments, quand ceux-ci ne commencent pas par / -ou ./. - - -Dir::Cache contient les emplacements qui renseignent sur le -cache local : par exemple, les deux caches de paquets -srcpkgcache et pkgcache, et aussi l'endroit o sont -places les archives tlcharges, Dir::Cache::archives. On peut -empcher la cration des caches en saisissant un nom vide. Cela ralentit -le dmarrage mais sauve de l'espace disque. Il vaut mieux se passer du -cache pkgcache plutt que se passer du cache srcpkgcache. -Comme pour Dir::State, le rpertoire par dfaut est contenu dans -Dir::Cache. - - -Dir::Etc contient l'emplacement des fichiers de configuration, -sourcelist indique l'emplacement de la liste de sources et -main est le fichier de configuration par dfaut (le modifier -n'a aucun effet, moins qu'on ne le modifie avec le fichier de -configuration indiqu par la variable APT_CONFIG). - - -Dir::Parts lit, par ordre d'entre, tous les fragments de -configuration dans le rpertoire indiqu. Ensuite, le fichier principal -de configuration est charg. - - -Les programmes binaires sont points par Dir::Bin. -L'emplacement des gestionnaires de mthodes est indiqu par -Dir::Bin::Methods ; gzip, -dpkg, apt-get, -dpkg-source, dpkg-buildpackage -et apt-cache -indiquent l'emplacement des programmes correspondants. - - -L'option de configuration RootDir a une signification -particulire. Lorsqu'elle est dfinie, tous les chemins dclars dans -Dir:: sont considrs relativement -RootDir, mme les chemins spcifis de manire -absolue. Ainsi par exemple si RootDir est -dfini comme /tmp/staging, et que chemin du fichier d'tat -Dir::State::status est dclar comme -/var/lib/dpkg/status alors ce fichier sera cherch -dans /tmp/staging/var/lib/dpkg/status. - - - -APT et DSelect - -Quand APT est utilis comme une mthode de &dselect;, plusieurs directives -contrlent le comportement par dfaut. On les trouve dans la section -DSelect. - - - -Clean - -Mode de nettoyage du cache ; cette variable peut prendre l'une des valeurs -suivantes :  always ,  prompt , - auto ,  pre-auto  et  never . - always  et  prompt  suppriment tous les paquets du -cache aprs la mise niveau ;  prompt  (valeur par dfaut) -les supprime aprs une demande et  auto  ne supprime que les -archives qui ne peuvent plus tre tlcharges (remplaces, par exemple, par -une nouvelle version).  pre-auto  les supprime avant de rcuprer -de nouveaux paquets. - - - -Options - -Le contenu de cette variable est pass comme options de ligne de commande -&apt-get; lors de la phase d'installation. - - -UpdateOptions - -Le contenu de cette variable est pass comme options de ligne de commande -&apt-get; lors de la phase de mise jour. - - - -PromptAfterUpdate - -Si cette option est  vraie , l'opration [U]pdate de &dselect; -interroge toujours l'utilisateur avant de continuer. Par dfaut, ce n'est -qu'en cas d'erreur que l'on propose l'utilisateur d'intervenir. - - - - - -Comment APT appelle &dpkg; - -Plusieurs directives de configuration contrlent la manire dont APT -invoque &dpkg; : elles figurent dans la section DPkg. - - -Options - -Il s'agit d'une liste d'options passer &dpkg;. Les options doivent tre -dclares en utilisant la notation de liste et chaque lment de la liste est -pass comme un seul argument &dpkg;. - - -Pre-InvokePost-Invoke - -Il s'agit d'une liste de commandes shell excuter avant ou aprs l'appel de -&dpkg;. Tout comme pour Options, on doit utiliser la notation de -liste. Les commandes sont appeles dans l'ordre, en utilisant -/bin/sh : APT s'arrte ds que l'une d'elles choue. - - -Pre-Install-Pkgs - -Il s'agit d'une liste de commandes shell excuter avant d'appeler &dpkg;. -Tout comme pour Options, on doit utiliser la notation de liste. -Les commandes sont appeles dans l'ordre, en utilisant -/bin/sh : APT s'arrte ds que l'une d'elles choue. Sur -l'entre standard, APT transmet aux commandes les noms de tous les fichiers -.deb qu'il va installer, raison d'un par ligne. - - -La deuxime version de ce protocole donne plus de renseignements : on -obtient la version du protocole, la configuration de APT et les paquets, -fichiers ou versions qui ont chang. On autorise cette version en positionnant -DPkg::Tools::Options::cmd::Version 2. cmd est une -commande passe Pre-Install-Pkgs. - - -Run-Directory - -APT se place dans ce rpertoire avant d'appeler &dpkg; ; par dfaut c'est -le rpertoire /. - - -Build-Options - -Ces options sont passes &dpkg-buildpackage; lors de la compilation des -paquets ; par dfaut la signature est dsactive et tous les binaires sont -crs. - - - - - - -Options  Periodic  et  Archive  - -Les groupes d'options APT::Periodic et -APT::Archive configurent les comportements priodiques -raliss par le script /etc/cron.daily/apt, lanc -quotidiennement. - - -APT::Periodic -Les options de cette section permettent de configurer la frquence -d'excution des tches APT lances automatiquement. Ces paramtre prennent -comme valeurs des priodicits d'excution en nombre de jours. - - -Update-Package-List : priodicit de mise jour de la -liste des paquets disponibles. (0 = dsactiv) - - -Download-Upgradable-Packages : priodicit de -tlchargement dans le cache des paquets pour lesquels une mise jour est -disponible. (0 = dsactiv) - - -AutocleanInterval : priodicit des - autoclean , c'est dire de la suppression du cache des paquets -qui ne peuvent plus tre tlchargs. (0 = dsactiv) - - -Unattended-Upgrade : priodicit de mise jour -automatique du systme sans intervention humaine. Le paquet -unattended-upgrades doit tre install pour que cette tche -s'excute. Le cas chant un fichier journal est crit dans -/var/log/unattended-upgrades. (0 = dsactiv) - - -APT::Archive -Les options de la section APT::Archive permettent de contrler la taille -du cache de paquets. - - -MaxAge : anciennet maximale d'un paquet dans le cache, -en nombre de jours. Les paquets plus anciens sont supprims. (0 = dsactiv) - - -MaxSize : taille maximale du cache en Mo. (0 = -dsactive) Si ce maximum est dpass, des paquets sont supprims jusqu' ce -que la taille du cache repasse sous la limite. Les paquets les plus volumineux -sont supprims en premier. - - -MinAge : age minimum d'un paquet du cache, en nombre de -jours (0 = dsactiv). Un paquet plus rcent ne sera pas supprim. Cette option -est utile pour garder disposition une version des paquets en cas de problme -grave. - - - - - -Les options de dbogage - -Les options de la section Debug:: servent soit provoquer -l'affichage d'informations de dbogage sur la sortie d'erreur standard du -programme qui utilise les librairies APT, soit activer des modes de -fonctionnement spciaux qui sont principalement utiles pour dboguer le -comportement de APT. La plupart de ces options n'ont pas -d'intrt pour un utilisateur normal, mais certaines peuvent tout de mme tre -utiles : - - - -Debug::pkgProblemResolver affiche d'intressantes -informations sur les dcisions prises par les commandes dist-upgrade, -upgrade, install, remove et purge. - - -Debug::NoLocking dsactive le verrouillage de fichier de -manire ce que APT puisse effectuer quelques oprations (telles que -apt-get -s install) sans tre  root . - - -Debug::pkgDPkgPM affiche la ligne de commande chaque appel -de &dpkg;. - - -Debug::IdentCdrom dsactive l'inclusion de donnes de type -statfs dans les ID de cdrom. - - - -Voici une liste complte des options de dbogage de APT. - -Debug::Acquire::cdrom - -Affiche les informations concernant les sources de type cdrom:// - - -Debug::Acquire::ftp - -Affiche les informations concernant le tlchargement de paquets par FTP. - - -Debug::Acquire::http - -Affiche les informations concernant le tlchargement de paquets par HTTP. - - -Debug::Acquire::https - -Affiche les informations concernant le tlchargement de paquets par HTTPS. - - -Debug::Acquire::gpgv - -Affiche les informations relatives la vrification de signatures -cryptographiques avec gpg. - - -Debug::aptcdrom - -Affiche des informations concernant l'accs aux collections de paquets -stockes sur cdrom. - - -Debug::BuildDeps - -Dcrit le processus de rsolution des dpendances pour la construction de -paquets source (  build-dependencies  ) par &apt-get;. - - -Debug::Hashes - -Affiche toutes les clefs de hachage cryptographiques gnres par les -librairies APT. - - -Debug::IdentCdrom -Dsactive l'inclusion des donnes de type -statfs pour la gnration des ID de cdrom, savoir le -nombre de blocs libres et utiliss sur le systme de fichier du cdrom. - - -Debug::NoLocking - -Dsactive le verrouillage de fichiers. Cela permet par exemple de lancer deux -instances de  apt-get update  en mme temps. - - -Debug::pkgAcquire - -Trace les ajouts et suppressions d'lments de la queue globale de -tlchargement. - - -Debug::pkgAcquire::Auth - -Affiche les dtails de la vrification des sommes de contrle et des signatures -cryptographiques des fichiers tlchargs, ainsi que les erreurs ventuelles. - - -Debug::pkgAcquire::Diffs - -Affiche les informations de tlchargement et de prise en compte des fichiers -diffrentiels des indexes de paquets, ainsi que les erreurs ventuelles. - - -Debug::pkgAcquire::RRed - -Affiche les dtails de la vrification des sommes de contrle et des signatures -cryptographiques des fichiers tlchargs, ainsi que les erreurs ventuelles. - - -Debug::pkgAcquire::Worker - -Affiche toutes les interactions avec les processus enfants qui se chargent -effectivement des tlchargements. - - -Debug::pkgAcquire::pkgAutoRemove - -Affiche les changements concernant le marquage des paquets comme installs -automatiquement, et la suppression des paquets inutiles. - - -Debug::pkgDepCache::AutoInstall - -Gnre les informations de dbogage dcrivant quels paquets sont installs -automatiquement pour satisfaire les dpendances. Cela concerne la passe -initiale d'installation automatique effectue par exemple par -apt-get install et pas le systme de rsolution de -dpendances complet de APT ; voir -Debug::pkgProblemResolver pour ce dernier. - - -Debug::pkgInitConfig - -Au lancement, affiche l'ensemble de la configuration sur la sortie d'erreur -standard. - - -Debug::pkgDPkgPM - -Affiche la commande exacte d'invocation de &dpkg; chaque appel ; les -arguments sont spars par des espaces. - - -Debug::pkgDPkgProgressReporting - Affiche l'ensemble des informations reues de &dpkg; par -l'intermdiaire du descripteur de fichier d'tat, et les ventuelles erreurs -d'analyse de ce fichier. - - -Debug::pkgOrderList - -Affiche les tapes de l'algorithme utilis pour choisir l'ordre dans lequel APT -passe les paquets &dpkg;. - - -Debug::pkgPackageManager - -Affiche le dtail des oprations lies l'invocation de &dpkg;. - - -Debug::pkgPolicy - -Au lancement, affiche la priorit de chaque liste de paquets. - - -Debug::pkgProblemResolver - -Affiche la trace d'excution du systme de rsolution de dpendances (ne -concerne que les cas o un problme de dpendances complexe se prsente). - - -Debug::sourceList - -Affiche les fournisseurs dclars dans le fichier -/etc/apt/vendors.list. - - - - - - - -Exemples - -Le fichier &configureindex; contient un modle de fichier montrant des exemples -pour toutes les options existantes. - - - -Fichiers - /etc/apt/apt.conf - - -Voir aussi - -&apt-cache;, &apt-config;, &apt-preferences;. - - -&manbugs; -&deux-traducteurs; - diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr deleted file mode 100644 index 651100497..000000000 --- a/doc/fr/apt.ent.fr +++ /dev/null @@ -1,272 +0,0 @@ - - - - -&docdir;examples/configure-index.gz"> -/etc/apt.conf"> - - - - - - apt.conf - 5 - " -> - - - apt-get - 8 - " -> - - - apt-config - 8 - " -> - - - apt-cdrom - 8 - " -> - - - apt-cache - 8 - " -> - - - apt_preferences - 5 - " -> - - - apt-key - 8 - " -> - - - apt-secure - 8 - " -> - - - apt-ftparchive - 1 - " -> - - - sources.list - 5 - -"> - - - reportbug - 1 - " -> - - - dpkg - 8 - " -> - - - dpkg-buildpackage - 1 - " -> - - - gzip - 1 - " -> - - - dpkg-scanpackages - 8 - " -> - - - dpkg-scansources - 8 - " -> - - - dselect - 8 - " -> - - - aptitude - 8 - " -> - - - synaptic - 8 - " -> - - - debsign - 1 - " -> - - - debsig-verify - 1 - " -> - - - gpg - 1 - " -> - - - -
apt@packages.debian.org
- Jason Gunthorpe - 1998-2001 Jason Gunthorpe - 14 dcembre 2003 - Linux - -"> - - - apt@packages.debian.org - -"> - - - Jason - Gunthorpe - -"> - - - APT team - -"> - -Linux -"> - - apt@packages.debian.org - -"> - - - Jason Gunthorpe - 1998-2001 - -"> - - - -Bogues - -Voyez la page concernant les bogues d'APT. - Si vous voulez signaler un bogue, consultez le texte - /usr/share/doc/debian/bug-reporting.txt ou utilisez la -commande &reportbug;. - " -> - - -Auteur - - APT a t crit par l'quipe APT apt@packages.debian.org. - - " -> - - -Traduction - -Jrme Marant. 2000 ; mise jour : Philippe Batailler. 2005. -debian-l10n-french@lists.debian.org. -" -> - -Traduction - -Philippe Batailler. debian-l10n-french@lists.debian.org. 2005. - -"> - - - - - -Affiche un mode d'emploi succinct. - - - - - - -Affiche la version du programme. - - - - - - -Fichier de configuration ; indique quel fichier de configuration utiliser. -Le programme lit le fichier de configuration par dfaut, puis celui-ci. -Voyez &apt-conf; pour la syntaxe. - - - - - - -Donne une option de configuration ; cela fixe une option de configuration -arbitraire. La syntaxe est : . - - -"> - - - -Toutes les options en ligne de commande peuvent tre positionnes via le -fichier de configuration ; les descriptifs indiquent l'option de -configuration positionner. En ce qui concerne les options boolennes, -on peut annuler le fichier de configuration en utilisant quelque chose comme -,, -ou d'autres variantes. - -"> diff --git a/doc/fr/apt_preferences.fr.5.xml b/doc/fr/apt_preferences.fr.5.xml deleted file mode 100644 index aba9f0d06..000000000 --- a/doc/fr/apt_preferences.fr.5.xml +++ /dev/null @@ -1,581 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.team; - &apt-email; - &apt-product; - - 29 Fvrier 2004 - - - -apt_preferences -5 - - - -apt_preferences -Un fichier de contrle des prfrences pour APT - - -Description - -Le fichier d'APT, /etc/apt/preferences, peut tre utilis pour -choisir la version des paquets que l'on veut installer. - -Quand le fichier &sources-list; contient des rfrences plusieurs -distributions (par exemple, stable et -testing), plusieurs versions d'un paquet peuvent tre -installes. APT affecte une priorit chaque version disponible. La commande -apt-get, tenant compte des contraintes de -dpendance, installe la version qui possde la priorit la plus haute. -Le fichier des prfrences annule les priorits assignes par dfaut -aux versions des paquets : ainsi l'utilisateur peut choisir la version -qu'il veut installer. - - -Si le fichier &sources-list; contient, pour une mme distribution, -des rfrences plusieurs sites de tlchargement, il peut exister plusieurs -exemplaires de la mme version d'un paquet. Dans ce cas, -apt-get tlcharge l'exemplaire qui apparat en premier -dans le fichier &sources-list;. Le fichier des prfrences n'influe pas sur -le choix des exemplaires, seulement sur le choix de la version. - - -Les priorits affectes par dfaut - -Quand le fichier des prfrences n'existe pas, ou quand aucune entre -de ce fichier ne s'applique une version prcise, la priorit affecte -cette version est la priorit de la distribution laquelle elle appartient. -On peut distinguer une distribution et lui donner une priorit plus haute -que celle des autres distributions : on l'appelle la distribution par -dfaut ou  target release  et elle peut tre dfinie sur la ligne -de commande de apt-get ou dans le fichier de configuration -d'APT, /etc/apt/apt.conf. -Par exemple : - - -apt-get install -t testing paquet - - - -APT::Default-Release "stable"; - - - -Quand une distribution par dfaut a t indique, APT utilise -l'algorithme suivant pour dterminer la priorit des versions d'un -paquet : - - -une priorit gale 100 -est affecte la version dj installe (si elle existe). - - -une priorit gale 500 -est affecte aux versions qui ne sont pas installes et -qui n'appartiennent pas la distribution par dfaut. - - -une priorit gale 990 -est affecte aux versions qui ne sont pas installes et -qui appartiennent la distribution par dfaut. - - - - -Quand aucune distribution par dfaut n'a t indique, APT affecte -simplement une priorit gale 100 toute version installe d'un paquet -et une priorit gale 500 tout version non installe. - - -Puis APT applique les rgles suivantes pour dterminer la version -du paquet qu'il faut installer (elles sont listes par ordre de priorit) : - - - -Ne jamais revenir en arrire, sauf si la priorit d'une -version disponible dpasse 1000.  Revenir en arrire  signifie -installer une version moins rcente que la version installe. Il -faut noter qu'aucune des priorits par dfaut n'excde 1000 ; de telles -valeurs ne peuvent tre dfinies que dans le fichier des prfrences. Notez -aussi qu'il est risqu de revenir en arrire. - - -Installer la version qui possde la priorit la plus -haute. - - -Quand deux (ou plus) versions ont la mme priorit, -installer la version la plus rcente (c.--d. celle dont le numro de -version est le plus grand). - - -Quand deux (ou plus) versions ont la mme priorit et le -mme numro de version, mais soit les paquets diffrent par certaines -mtadonnes, soit l'option --reinstall a t donne, installer la -version qui n'est pas installe. - - - - -En gnral, la version installe d'un paquet (priorit 100) n'est -pas aussi rcente que les versions disponibles dans les sources -listes dans le fichier &sources-list; (priorit 500 ou 990). Et donc le -paquet sera mis niveau avec la commande : -apt-get install paquet ou -apt-get dist-upgrade. - - -La version installe d'un paquet peut tre - rarement - -plus rcente que tout autre version disponible. Les commandes -apt-get install paquet ou -apt-get upgrade ne provoquent pas de retour en arrire. - - -Parfois, la version installe d'un paquet est plus rcente que la -version appartenant la distribution par dfaut, mais moins rcente que -la version appartenant une autre distribution. Une telle version sera mise - niveau par les commandes -apt-get install paquet ou -apt-get upgrade car au moins l'une des versions -disponibles possde une plus haute priorit que celle de la version installe. - - - -Consquences des prfrences - -Le fichier des prfrences permet l'administrateur systme de -contrler l'affectation des priorits. Ce fichier est constitu d'une ou -plusieurs entres spares par des lignes blanches. Ces entres peuvent avoir -deux formes, une forme particulire et une forme gnrale. - - -La forme particulire affecte une priorit -(Pin-Priority) un paquet prcis, une version prcise -ou un intervalle spcifiant plusieurs versions. Par exemple, l'entre -suivante affecte une priorit haute toutes les versions du paquet -perl dont le numro de version commence par 5.8. - - - -Package: perl -Pin: version 5.8* -Pin-Priority: 1001 - - - - -La forme gnrale affecte une priorit toutes les versions d'un paquet dans -une distribution donne (c'est--dire, toutes les versions d'un paquet qui -sont listes dans un fichier Release), ou toutes les versions -d'un paquet provenant d'un site internet identifi par un nom compltement -qualifi. - - -Cette forme gnrale des entres du fichier des prfrences -s'applique seulement aux groupes de paquets. Par exemple, l'entre suivante -affecte une priorit haute toutes les versions disponibles dans le -site local. - - - -Package: * -Pin: origin "" -Pin-Priority: 999 - - -Attention ! le mot-cl utilis ici, origin, ne doit pas -tre confondu avec l'Origine d'une distribution indique dans -un fichier Release. Ce qui suit l'tiquette  Origin:  -dans un fichier Release n'est pas une adresse internet -mais le nom d'un auteur ou d'un distributeur, comme Debian ou Ximian. - -L'entre suivante affecte une priorit basse toutes les versions -d'un paquet appartenant toute distribution dont le nom -d' Archive  est unstable. - - - -Package: * -Pin: release a=unstable -Pin-Priority: 50 - - -L'entre suivante affecte une priorit haute toutes les versions -d'un paquet appartenant toute distribution dont le nom -d' Archive  est stable et dont le numro -de  Version  est 3.0. - - - -Package: * -Pin: release a=stable, v=3.0 -Pin-Priority: 500 - - - - - - - -Comment APT interprte-t-il les priorits ? - -Les priorits (P) indiques dans le fichier des prfrences doivent -tre des entiers positifs ou ngatifs. Ils sont interprts peu prs -comme suit : - - -P > 1000 - -Cette priorit entrane l'installation du paquet mme s'il -s'agit d'un retour en arrire. - - - -990 < P <=1000 - -La version sera installe, mme si elle n'appartient pas -la distribution par dfaut ; mais elle ne sera pas installe si la -version installe est plus rcente. - - - -500 < P <=990 - -La version sera installe, sauf s'il existe une version -appartenant la distribution par dfaut ou si la version installe est plus -rcente. - - - -100 < P <=500 - -La version sera installe, sauf s'il existe une version -appartenant une autre distribution ou si la version installe est plus -rcente. - - - -0 < P <=100 - -La version sera installe si aucune version du paquet -n'est installe. - - - -P < 0 - -Cette priorit empche l'installation de la version. - - - - - -Si l'une des entres de forme particulire correspond la version -disponible d'un paquet, la premire entre trouve dtermine la priorit de -cette version. S'il n'en existe pas, et si l'une des entres de forme gnrale -correspond la version disponible d'un paquet, la premire entre trouve -dtermine la priorit. - - -Supposons par exemple que le fichier des prfrences contienne les trois -entres dcrites ci-dessous : - - - -Package: perl -Pin: version 5.8* -Pin-Priority: 1001 - -Package: * -Pin: origin "" -Pin-Priority: 999 - -Package: * -Pin: release unstable -Pin-Priority: 50 - - - -Alors : - - - -La version la plus rcente du paquet perl sera -install pour autant que son numro de version commence par 5.8. -Si l'une des versions 5.8* existe et si la version installe est -une version 5.9*, il y aura un retour en arrire. - - -Les versions des paquets (autres que perl) -disponibles dans le site local ont priorit sur les autres versions, -mme celles appartenant la distribution par dfaut. - - -La version d'un paquet dont l'origine n'est pas le site -local mais un site internet list dans &sources-list; et qui appartient une -distribution unstable, ne sera installe que si aucune version -du paquet n'est dj installe. - - - - - -Dtermination de la version des paquets et des proprits des -distributions - -Chaque source liste dans le fichier &sources-list; doit fournir -les fichiers Packages et Release -qui dcrivent les paquets disponibles cet endroit. - -Le fichier Packages se trouve normalement dans le -rpertoire -.../dists/dist-name/component/arch, par exemple, -.../dists/stable/main/binary-i386/Packages. Il consiste -en entres composes de lignes, une pour chaque paquet disponible dans le -rpertoire. Seules deux lignes des entres sont pertinentes pour la -dtermination des priorits : - - -La ligne Package: - -donne le nom du paquet - - - -La ligne Version: - -donne le numro de version du paquet - - - - - -Le fichier Release se trouve normalement dans le -rpertoire -.../dists/dist-name, par exemple, .../dists/stable/Release, ou .../dists/woody/Release. -Il consiste en une seule entre compose de plusieurs lignes qui s'applique -tous les paquets situs dans les rpertoires sous -le rpertoire parent. Contrairement au fichier Packages, presque -toutes les lignes du fichier Release sont pertinentes pour -dterminer les priorits : - - - -La ligne Archive: - -nomme l'archive laquelle appartiennent tous les -paquets situs dans les rpertoires. Par exemple, la ligne -Archive: stable indique que tous les paquets dans les rpertoires -situs sous le rpertoire parent du fichier Release appartiennent - l'archive stable. Indiquer cette valeur dans le fichier des -prfrences demanderait cette ligne : - - -Pin: release a=stable - - - - - -La ligne Version: - -indique la version de la distribution. Par exemple, les -paquets dans les rpertoires peuvent appartenir la -distribution Debian GNU/Linux version 3.0. Il n'y a pas de numro de version -pour les distributions testing et unstable car elles -n'ont pas encore t publies. Indiquer cette valeur dans le fichier des prfrences demanderait -ces lignes : - - -Pin: release v=3.0 -Pin: release a=stable, v=3.0 -Pin: release 3.0 - - - - - -La ligne Component: - -nomme un composant qui indique le type de licence associe -aux paquets situs dans les rpertoires sous le fichier -Release. Par exemple, la ligne Component: main indique -que tous les exemplaires dans les rpertoires appartiennent au composant -main, c'est--dire que leur licence est en accord avec les -Directives Debian pour le logiciel libre. Indiquer ce composant dans le -fichier des prfrences demanderait cette ligne : - - -Pin: release c=main - - - - - -La ligne Origin: - -nomme l'origine des paquets situs -dans les rpertoires sous le fichier Release. En gnral, c'est -Debian. Indiquer cette origine dans le fichier des prfrences -demanderait cette ligne : - - -Pin: release o=Debian - - - - - -La ligne Label: - -indique un label pour les paquets qui se trouvent -dans les rpertoires sous le fichier Release. En gnral, c'est -Debian. Indiquer cette origine dans le fichier des prfrences -demanderait cette ligne : - - -Pin: release l=Debian - - - - - -Tous les fichiers Packages et -Release rcuprs dans des sources listes par le -fichier &sources-list; sont conservs dans le rpertoire -/var/lib/apt/lists ou dans le fichier spcifi par la -variable Dir::State::Lists dans le fichier apt.conf. -Par exemple, le fichier -debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release -contient le fichier Release du site -debian.lcs.mit.edu, architecture binary-i386 et -composant contrib de la distribution unstable. - - - -Lignes facultatives dans le fichier des prfrences - -Toute entre du fichier des prfrences peut commencer par une ou -plusieurs lignes contenant le mot Explanation:. Cela permet des -commentaires. - -La ligne Pin-Priority: d'une entre est facultative. Si elle -n'existe pas, APT affecte une priorit infrieure de 1 la valeur spcifie -sur une ligne commenant par Pin-Priority: release .... - - - - - -Exemples -Comment suivre Stable ? - -Le fichier des prfrences suivant affecte une priorit plus haute que -la priorit par dfaut (500) tous les exemplaires appartenant la -distribution stable et une priorit prohibitivement basse tous -les exemplaires appartenant d'autres distributions Debian. - - -Explanation: Ne pas installer des exemplaires d'origine Debian -Explanation: sauf ceux de la distribution stable -Package: * -Pin: release a=stable -Pin-Priority: 900 - -Package: * -Pin: release o=Debian -Pin-Priority: -10 - - - -Avec le fichier des prfrences ci-dessus et un fichier &sources-list; -adquat, les commandes suivantes utiliseront les versions les plus rcentes -de stable pour faire la mise niveau : - - -apt-get install paquet -apt-get upgrade -apt-get dist-upgrade - - - -La commande suivante utilisera la version la plus rcente de la -distribution testing pour mettre niveau le paquet spcifi ; -cependant les mises niveau ultrieures du paquet ne se feront pas - moins de relancer la commande. - - -apt-get install paquet/testing - - - - -Comment suivre Testing ou Unstable ? - -Le fichier des prfrences suivant affecte une priorit haute aux -versions des paquets appartenant la distribution testing, une -priorit moindre aux versions appartenant la distribution unstable -et une priorit prohibitivement basse aux versions appartenant d'autres -distributions Debian. - - -Package: * -Pin: release a=testing -Pin-Priority: 900 - -Package: * -Pin: release a=unstable -Pin-Priority: 800 - -Package: * -Pin: release o=Debian -Pin-Priority: -10 - - - -Avec un fichier &sources-list; appropri et le fichier des prfrences -ci-dessus, les commandes suivantes -utiliseront les versions les plus rcentes de testing pour faire -la mise niveau : - - -apt-get install paquet -apt-get upgrade -apt-get dist-upgrade - - - -La commande suivante utilisera la version la plus rcente de la -distribution unstable pour mettre niveau le paquet spcifi ; -Par la suite, apt-get upgrade mettra le paquet jour -avec la plus rcente version dans testing si elle est plus rcente -que la version installe ou avec la plus rcente version dans -unstable si elle est plus rcente que la version installe. - - -apt-get install paquet/unstable - - - - - -See Also - -&apt-get; &apt-cache; &apt-conf; &sources-list; - - - - &manbugs; -&traducteur; - diff --git a/doc/fr/makefile b/doc/fr/makefile index c650dc03a..214534736 100644 --- a/doc/fr/makefile +++ b/doc/fr/makefile @@ -5,59 +5,7 @@ SUBDIR=doc/fr # Bring in the default rules include ../../buildlib/defaults.mak -# Do not use XMLTO, build the manpages directly with XSLTPROC -XSLTPROC=/usr/bin/xsltproc -STYLESHEET=./style.fr.xsl - - -# Man pages -SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \ - sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \ - apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \ - apt-key.fr.8 apt-secure.fr.8 - -INCLUDES = apt.ent.fr - -doc: $(SOURCE) - -$(SOURCE) :: % : %.xml $(INCLUDES) - echo Creating man page $@ - $(XSLTPROC) -o $@ $(STYLESHEET) $< - -apt-cache.fr.8:: apt-cache.8 - cp $< $@ - -apt-get.fr.8:: apt-get.8 - cp $< $@ - -apt-cdrom.fr.8:: apt-cdrom.8 - cp $< $@ - -apt.conf.fr.5:: apt.conf.5 - cp $< $@ - -apt-config.fr.8:: apt-config.8 - cp $< $@ - -sources.list.fr.5:: sources.list.5 - cp $< $@ - -apt-sortpkgs.fr.1:: apt-sortpkgs.1 - cp $< $@ - -apt-ftparchive.fr.1:: apt-ftparchive.1 - cp $< $@ - -apt_preferences.fr.5:: apt_preferences.5 - cp $< $@ - -apt-extracttemplates.fr.1:: apt-extracttemplates.1 - cp $< $@ - -apt-key.fr.8:: apt-key.8 - cp $< $@ - -apt-secure.fr.8:: apt-secure.8 - cp $< $@ - +# Language Code of this translation +LC=fr +include $(PO4A_MANPAGE_H) diff --git a/doc/fr/sources.list.fr.5.xml b/doc/fr/sources.list.fr.5.xml deleted file mode 100644 index 4235480f8..000000000 --- a/doc/fr/sources.list.fr.5.xml +++ /dev/null @@ -1,257 +0,0 @@ - - -%aptent; - -]> - - - - - &apt-author.jgunthorpe; - &apt-author.team; - &apt-email; - &apt-product; - - 29 February 2004 - - - -sources.list -5 - - - -sources.list -Liste des sources de paquets - - -Description - -La liste des sources de paquets indique o trouver les archives -du systme de distribution de paquets utilis. Pour l'instant, cette page -de manuel ne documente que le systme d'empaquetage utilis par le systme -Debian GNU/Linux. Ce fichier de contrle est /etc/apt/sources.list. - - -La liste des sources est conue pour prendre en compte un nombre quelconque -de sources actives et diffrents mdia. Le fichier prsente -une source par ligne et la source prfre apparat en premier. Le format de -chaque ligne est : type uri args. Le premier lment, -type, dtermine le format des args. -uri est un -identificateur universel de ressources (URI), qui est un sur-ensemble du plus -spcifique et bien connu repre universel de ressources, ou URL. La fin de la -ligne peut tre un commentaire commenant par un caractre #. - - - -sources.list.d - Le rpertoire /etc/apt/sources.list.d permet de -lister des sources de paquets dans des fichiers distincts qui se terminent -par .list. Leur format est le mme que celui du fichier -sources.list. - - - -Les types deb et deb-src. - -Le type deb dcrit une archive Debian classique deux niveaux, -distribution/composant. distribution peut prendre -l'une des valeurs suivantes : stable, unstable, ou -testing, et composant : main, -contrib, -non-free, ou non-us. -Le type deb-src dcrit le -code source pour une distribution Debian dans le mme format que le type -deb. Une ligne deb-src est ncessaire pour rcuprer les -index des sources. - - -Le format d'une entre dans sources.list utilisant les types -deb et deb-src est de la forme : - - deb uri distribution [composant1] [composant2] [...] - -L'URI de type deb doit indiquer la base de la distribution Debian -dans laquelle APT trouvera les informations dont il a besoin. -distribution peut spcifier le chemin exact : dans ce cas, on -doit omettre les composants et distribution doit se terminer par une -barre oblique (/). C'est utile quand seule une sous-section particulire de -l'archive dcrite par cet URI est intressante. Quand distribution -n'indique pas un chemin exact, un composant au moins doit tre -prsent. - - -distribution peut aussi contenir une variable $(ARCH), -qui sera remplace par l'architecture Debian (i386, m68k, powerpc, ...) -sur laquelle s'excute le systme. On peut ainsi utiliser un fichier -sources.list qui ne dpend pas d'une architecture. En gnral, -ce n'est intressant que si l'on indique un chemin exact ; sinon -APT cre automatiquement un URI en fonction de l'architecture -effective. - - -Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut tre -ncessaire de disposer le mme URI sur plusieurs lignes quand on veut -accder un sous-ensemble des distributions ou composants disponibles cette -adresse. APT trie les URI aprs avoir cre pour lui-mme la liste -complte ; il regroupe les rfrences multiples au mme hte Internet -en vue d'une connexion unique et il vite ainsi, par exemple, d'tablir une -connexion FTP, de la fermer, faire autre chose, puis d'tablir encore cette -connexion. Cette fonctionnalit permet l'accs des sites FTP surchargs qui -limitent le nombre de connexions simultanes pour les utilisateurs anonymes. -APT paralllise aussi les connexions diffrents htes pour tirer plus -efficacement parti des sites faible bande passante. - - -Il est important d'indiquer les sources par ordre de prfrence, -la source principale apparaissant en premier. Un tri est fait, de la plus -rapide la plus lente ; par exemple, un cdrom suivi par les htes d'un -rseau local, puis les htes distants. - -Voici quelques exemples : - - - -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://http.us.debian.org/debian dists/stable-updates/ - - - -La spcification des URI - -Les URI actuellement reconnus sont : cdrom, file, http et ftp. - -file - -Le procd file permet qu'un rpertoire arbitraire au sein du -systme de fichier soit considr comme une archive. On s'en sert avec les -montages NFS, les miroirs et les archives locaux. - - - -cdrom - -Le procd cdrom permet l'utilisation d'un lecteur de cdrom -avec la possibilit de changer de media. Utilisez le programme &apt-cdrom; -pour crer des entres dans la liste des sources. - - - - -http - -Le procd http indique un serveur HTTP comme archive. Si une -variable d'environnement http_proxy (au format http://server:port/) -existe, le serveur mandataire indiqu par http_proxy est utilis. -Quand un serveur mandataire HTTP/1.1 demande une authentification, on peut -utiliser la chane http://user:pass@server:port/. Notez qu'il s'agit d'une -mthode d'authentification peu sre. - - - - -ftp - -Le procd ftp indique un serveur FTP comme archive. Le -fonctionnement en mode ftp est largement configurable ; rfrez-vous - la page de manuel de &apt-cdrom; pour d'autres informations. On -remarquera qu'on peut indiquer un mandataire ftp avec la variable -d'environnement ftp_proxy. On peut aussi spcifier un mandataire http -(les serveurs mandataires http comprennent souvent les URL ftp) en utilisant -cette mthode et SEULEMENT cette mthode. Les mandataires ftp utilisant http -et qui sont spcifis dans le fichier de configuration seront ignors. - - - - -copy - -Le procd copy est identique au procd file -except que -les paquets sont copis dans le cache du rpertoire au lieu d'tre utiliss -directement depuis leur emplacement. C'est utile aux gens qui utilisent un -disque zip pour recopier des fichiers avec APT. - - - -rshssh - -Le procd rsh/ssh utilise rsh/ssh pour se connecter une -machine distante en tant que tel utilisateur donn et pour accder aux -fichiers. Aucune authentification par mot de passe n'est possible : il -faut au pralable rgler ce problme avec des cls RSA ou bien rhosts. Pour -l'accs aux fichiers de la machine distante et le transfert, on utilise les -commandes standard find et dd. - - - - - - -Exemples - -Utiliser l'archive stocke localement (ou monte via NFS) dans -/home/jason/debian pour stable/main, stable/contrib et stable/non-free. - - deb file:/home/jason/debian stable main contrib non-free - - -Comme ci-dessus, except que cette ligne utilise la distribution - unstable  (dveloppement). - - deb file:/home/jason/debian unstable main contrib non-free - - -La prcdente ligne, mais pour les sources. - -deb-src file:/home/jason/debian unstable main contrib non-free - - -Utiliser HTTP pour accder l'archive situe archive.debian.org, et -n'utiliser que la section hamm/main. - - deb http://archive.debian.org/debian-archive hamm main - - -Utiliser FTP pour accder l'archive situe ftp.debian.org, dans le -rpertoire debian, et n'utiliser que la section stable/contrib. - - deb ftp://ftp.debian.org/debian stable contrib - - -Utiliser FTP pour accder l'archive situe ftp.debian.org, dans le -rpertoire debian, et n'utiliser que la section unstable/contrib. Si cette -ligne et celle de l'exemple prcdent dans sources.list -apparaissent, une seule session FTP sera utilise pour les deux lignes. - - deb ftp://ftp.debian.org/debian unstable contrib - - -Utiliser HTTP pour accder l'archive situe nonus.debian.org, dans le -rpertoire debian-non-US. - - deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free - - -Utiliser HTTP pour accder l'archive situe nonus.debian.org, dans le -rpertoire debian-non-US, et n'utiliser que les fichiers trouvs dans -unstable/binary-i386 pour les machines i386, dans -unstable/binary-m68k pour les machines m68k et ainsi de suite -pour les autres architectures reconnues. [Notez que cet exemple montre -seulement la manire d'utiliser la variable substituer, non-us n'tant plus -structur de cette manire.] - - deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/ - - -Voir aussi -&apt-cache; &apt-conf; - - -&manbugs; -&traducteur; - \ No newline at end of file diff --git a/doc/po/fr.po b/doc/po/fr.po new file mode 100644 index 000000000..7a9c63c2c --- /dev/null +++ b/doc/po/fr.po @@ -0,0 +1,8823 @@ +# Translation of apt package man pages +# Copyright (C) 2000-2009 Debian French l10n team +# This file is distributed under the same license as the apt package. +# +# Translators: +# Jérôme Marant, 2000. +# Philippe Batailler, 2005. +# Christian Perrier , 2009. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: 2009-07-30 22:55+0900\n" +"PO-Revision-Date: 2009-09-04 20:23+0200\n" +"Last-Translator: Christian Perrier \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: ENCODING\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. type: TH +#: apt.8:17, no-wrap +msgid "apt" +msgstr "apt" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "16 June 1998" +msgstr "16 Juin 1998" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "Debian GNU/Linux" +msgstr "Debian GNU/Linux" + +#. type: SH +#: apt.8:18 +#, no-wrap +msgid "NAME" +msgstr "NOM" + +#. type: Plain text +#: apt.8:20 +msgid "apt - Advanced Package Tool" +msgstr "apt - Outil complet de gestion de paquets" + +#. type: SH +#: apt.8:20 +#, no-wrap +msgid "SYNOPSIS" +msgstr "RÉSUMÉ" + +#. type: Plain text +#: apt.8:22 +msgid "B" +msgstr "B" + +#. type: SH +#: apt.8:22 +#, no-wrap +msgid "DESCRIPTION" +msgstr "DESCRIPTION" + +#. type: Plain text +#: apt.8:31 +msgid "" +"APT is a management system for software packages. For normal day to day " +"package management there are several frontends available, such as B" +"(8) for the command line or B(8) for the X Window System. Some " +"options are only implemented in B(8) though." +msgstr "" +"APT est un système de gestion de paquets logiciels. Pour la gestion au quotidien des paquets, il existe plusieurs frontaux comme B(9) à " +"la ligne de commande ou B(8) pour X Window. Cependant, certaines options ne sont disponibles que dans B(8)." + +#. type: SH +#: apt.8:31 +#, no-wrap +msgid "OPTIONS" +msgstr "OPTIONS" + +#. type: Plain text +#: apt.8:33 apt.8:35 +msgid "None." +msgstr "Aucune." + +#. type: SH +#: apt.8:33 +#, no-wrap +msgid "FILES" +msgstr "FICHIERS" + +#. type: SH +#: apt.8:35 +#, no-wrap +msgid "SEE ALSO" +msgstr "VOIR AUSSI" + +#. type: Plain text +#: apt.8:42 +msgid "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" +msgstr "" +"B(8), B(8), B(5), B(5), " +"B(5), B(8)" + +#. type: SH +#: apt.8:42 +#, no-wrap +msgid "DIAGNOSTICS" +msgstr "DIAGNOSTIQUE" + +#. type: Plain text +#: apt.8:44 +msgid "apt returns zero on normal operation, decimal 100 on error." +msgstr "" +"apt-get renvoie zéro après une opération normale et la " +"valeur décimale 100 en cas d'erreur." + +#. type: SH +#: apt.8:44 +#, no-wrap +msgid "BUGS" +msgstr "BOGUES" + +#. type: Plain text +#: apt.8:46 +msgid "This manpage isn't even started." +msgstr "Cette page de manuel n'a même pas commencé à être rédigée." + +#. type: Plain text +#: apt.8:55 +msgid "" +"See Ehttp://bugs.debian.org/aptE. If you wish to report a bug in " +"B, please see I or the " +"B(1) command." +msgstr "" +"Voir Ehttp://bugs.debian.org/aptE. Si vous souhaitez remonter un bogue dans B, veuillez lire I" +" ou utiliser la commande B(1)." + +#. type: SH +#: apt.8:55 +#, no-wrap +msgid "AUTHOR" +msgstr "AUTEURS" + +#. type: Plain text +#: apt.8:56 +msgid "apt was written by the APT team Eapt@packages.debian.orgE." +msgstr "apt a été écrit par l'équipe de développement APT Eapt@packages.debian.orgE." + +#. type: Plain text +#: apt.ent:2 +msgid "" +msgstr "" + +#. type: Plain text +#: apt.ent:10 +msgid "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " +msgstr "" +" &docdir;examples/configure-index.gz\"> /etc/apt.conf\"> " + +#. type: Plain text +#: apt.ent:17 +#, no-wrap +msgid "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +"\n" +" apt.conf\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:23 +#, no-wrap +msgid "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-get\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:29 +#, no-wrap +msgid "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-config\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:35 +#, no-wrap +msgid "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cdrom\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:41 +#, no-wrap +msgid "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-cache\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:47 +#, no-wrap +msgid "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt_preferences\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:53 +#, no-wrap +msgid "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-key\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:59 +#, no-wrap +msgid "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-secure\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:65 +#, no-wrap +msgid "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" apt-ftparchive\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:72 +#, no-wrap +msgid "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" +msgstr "" +"\n" +" sources.list\n" +" 5\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:78 +#, no-wrap +msgid "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" reportbug\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:84 +#, no-wrap +msgid "" +"\n" +" dpkg\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:90 +#, no-wrap +msgid "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-buildpackage\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:96 +#, no-wrap +msgid "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gzip\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:102 +#, no-wrap +msgid "" +"\n" +" dpkg-scanpackages\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scanpackages\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:108 +#, no-wrap +msgid "" +"\n" +" dpkg-scansources\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dpkg-scansources\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:114 +#, no-wrap +msgid "" +"\n" +" dselect\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" dselect\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:120 +#, no-wrap +msgid "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" aptitude\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:126 +#, no-wrap +msgid "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" +msgstr "" +"\n" +" synaptic\n" +" 8\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:132 +#, no-wrap +msgid "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsign\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:138 +#, no-wrap +msgid "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" debsig-verify\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:144 +#, no-wrap +msgid "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gpg\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:150 +#, no-wrap +msgid "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" gnome-apt\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:156 +#, no-wrap +msgid "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" +msgstr "" +"\n" +" wajig\n" +" 1\n" +" \"\n" +">\n" + +#. type: Plain text +#: apt.ent:165 +#, no-wrap +msgid "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" Jason Gunthorpe\n" +" 1998-2001 Jason Gunthorpe\n" +" 28 October 2008\n" +" Linux\n" +msgstr "" +"\n" +"\n" +"
apt@packages.debian.org
\n" +" Jason Gunthorpe\n" +" 1998-2001 Jason Gunthorpe\n" +" 28 octobre 2008\n" +" Linux\n" + +#. type: Plain text +#: apt.ent:168 +#, no-wrap +msgid "" +" \n" +"\"> \n" +msgstr "" +" \n" +"\"> \n" + +#. type: Plain text +#: apt.ent:174 apt.ent:204 +#, no-wrap +msgid "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" +msgstr "" +"\n" +" apt@packages.debian.org\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:181 apt.ent:211 +#, no-wrap +msgid "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason\n" +" Gunthorpe\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:188 +#, no-wrap +msgid "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Mike\n" +" O'Connor\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:194 apt.ent:217 +#, no-wrap +msgid "" +"\n" +" APT team\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Équipe de développement d'APT\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:198 apt.ent:228 +#, no-wrap +msgid "" +"Linux\n" +"\">\n" +msgstr "" +"Linux\n" +"\">\n" + +#. type: Plain text +#: apt.ent:224 +#, no-wrap +msgid "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" +msgstr "" +"\n" +" Jason Gunthorpe\n" +" 1998-2001\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:234 +#, no-wrap +msgid "" +"\n" +"\t\tQA Page\n" +"\t\n" +"\">\n" +msgstr "" +"\n" +"\t\tPage qualité\n" +"\t\n" +"\">\n" + +#. type: Plain text +#: apt.ent:245 +#, no-wrap +msgid "" +"\n" +"Bugs\n" +" APT bug page. \n" +" If you wish to report a bug in APT, please see\n" +" /usr/share/doc/debian/bug-reporting.txt or the\n" +" &reportbug; command.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Bogues\n" +" Page des bogues d'APT. \n" +" Si vous souhaitez remonter un bogue à propos d'APT, veuillez lire\n" +" /usr/share/doc/debian/bug-reporting.txt ou utiliser\n" +" la commande &reportbug;.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:253 +#, no-wrap +msgid "" +"\n" +"Author\n" +" APT was written by the APT team apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Author\n" +" APT a été écrit par l'équipe de développement APT apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:263 +#, no-wrap +msgid "" +"\n" +"\n" +" \n" +" Show a short usage summary.\n" +" \n" +" \n" +" \n" +msgstr "" +"\n" +"\n" +" \n" +" Afficher un bref résumé de l'utilisation.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:271 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Show the program version.\n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Afficher la version du programme.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:281 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Configuration File; Specify a configuration file to use. \n" +" The program will read the default configuration file and then this \n" +" configuration file. See &apt-conf; for syntax information. \n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Fichier de configuration ; indique le fichier de configuration à utiliser. \n" +" Les programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n" +" Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation. \n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:293 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Set a Configuration Option; This will set an arbitrary\n" +" configuration option. The syntax is .\n" +" and can be used multiple\n" +" times to set different options.\n" +" \n" +" \n" +" \n" +"\">\n" +msgstr "" +" \n" +" \n" +" \n" +" Définir une option de configuration ; permet de régler\n" +" une option de configuration donnée. La syntaxe est .\n" +" et peuvent être utilisées plusieurs fois\n" +" pour définir des options différentes.\n" +" \n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:304 +#, no-wrap +msgid "" +"\n" +"All command line options may be set using the configuration file, the\n" +" descriptions indicate the configuration option to set. For boolean\n" +" options you can override the config file by using something like \n" +" ,, \n" +" or several other variations.\n" +" \n" +"\">\n" +msgstr "" +"\n" +"Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n" +" les descriptions indiquant l'option de configuration concernée. Pour les options\n" +" booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n" +" ,, \n" +" et d'autres variantes analogues.\n" +" \n" +"\">\n" + +#. The last update date +#. type: Content of: +#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 +#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"février 2004" + +#. type: Content of: +#: apt-cache.8.xml:22 apt-cache.8.xml:28 +msgid "apt-cache" +msgstr "apt-cache" + +#. type: Content of: +#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 +#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 +msgid "8" +msgstr "8" + +#. type: Content of: +#: apt-cache.8.xml:29 +msgid "APT package handling utility -- cache manipulator" +msgstr "Gestionnaire de paquets APT - manipulation du cache" + +#. type: Content of: +#: apt-cache.8.xml:35 +msgid "" +"apt-cache " +"add file gencaches showpkg pkg " +"showsrc pkg stats dump dumpavail unmet search regex show pkg depends pkg " +"rdepends pkg pkgnames prefix dotty pkg " +"xvcg pkg policy pkgs madison pkgs " +msgstr "" +"apt-cache " +" add fichier gencaches " +"showpkg paquet showsrc paquet stats dump dumpavail unmet search regex show paquet depends " +"paquet rdepends paquet pkgnames prefix dotty paquet policy paquets madison paquets " + +#. type: Content of: +#: apt-cache.8.xml:61 apt-cdrom.8.xml:46 apt-config.8.xml:46 +#: apt-extracttemplates.1.xml:42 apt-ftparchive.1.xml:54 apt-get.8.xml:114 +#: apt-key.8.xml:33 apt-mark.8.xml:43 apt-secure.8.xml:39 +#: apt-sortpkgs.1.xml:43 apt.conf.5.xml:38 apt_preferences.5.xml:32 +#: sources.list.5.xml:32 +msgid "Description" +msgstr "Description" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:62 +msgid "" +"<command>apt-cache</command> performs a variety of operations on APT's " +"package cache. <command>apt-cache</command> does not manipulate the state of " +"the system but does provide operations to search and generate interesting " +"output from the package metadata." +msgstr "" +"<command>apt-cache</command> réalise différentes opérations sur le cache de " +"paquet d'APT. <command>apt-cache</command> ne manipule pas l'état du " +"système mais fournit des moyens de recherche dans les métadonnées d'un " +"paquet desquelles il extrait les informations intéressantes." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:67 apt-get.8.xml:120 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given, " +"one of the commands below must be present." +msgstr "" +"À moins que l'option <option>-h</option> ou <option>--help</option> ne soit " +"donnée, l'une des commandes suivantes doit être présente." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:71 +msgid "add <replaceable>file(s)</replaceable>" +msgstr "add <replaceable>fichier(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:72 +msgid "" +"<literal>add</literal> adds the named package index files to the package " +"cache. This is for debugging only." +msgstr "" +"La commande <literal>add</literal> ajoute des fichiers indexant des paquets " +"au cache des paquets. Cela sert uniquement pour le débogage." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:76 +msgid "gencaches" +msgstr "gencaches" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:77 +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>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:83 +msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgstr "showpkg <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:84 +msgid "" +"<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 well " +"as forward dependencies for each version. Forward (normal) dependencies are " +"those packages upon which the package in question depends; reverse " +"dependencies are those packages that depend upon the package in question. " +"Thus, forward dependencies must be satisfied for a package, but reverse " +"dependencies need not be. For instance, <command>apt-cache showpkg " +"libreadline2</command> would produce output similar to the following:" +msgstr "" +"La commande <literal>showpkg</literal> affiche des informations sur les " +"paquets donnés en argument. Les arguments restants sont les noms de paquets. " +"Les versions disponibles et les dépendances inverses de chaque paquet " +"répertorié sont listées, ainsi que les dépendances normales pour chaque " +"version. Les dépendances normales d'un paquet sont constituées par les " +"paquets dont il dépend ; les dépendances inverses sont les paquets qui " +"dépendent du paquet en question. Les dépendances normales doivent donc être " +"satisfaites et les dépendances inverses n'ont pas besoin de l'être. Ainsi, " +"la commande <command>apt-cache showpkg libreadline2</command> donnera ce " +"résultat :" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-cache.8.xml:96, no-wrap +msgid "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +msgstr "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:108 +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, " +"libreadlineg2 and libreadline2-altdev depend on libreadline2. If " +"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be " +"installed; libreadlineg2 and libreadline2-altdev do not have to be " +"installed. For the specific meaning of the remainder of the output it is " +"best to consult the apt source code." +msgstr "" +"On peut voir que libreadline2, version 2.1-12, dépend de libc5 et " +"ncurses3.0 ; ces paquets doivent être installés au préalable pour que " +"libreadline2 fonctionne. À leur tour, libreadlineg2 et libreadline2-altdev " +"dépendent de libreadline2. Si libreadline2 est installé, libc5 et ncurses3.0 " +"doivent être installés ; libreadlineg2 et libreadline2-altdev n'ont pas " +"à l'être. Pour connaître le sens de la fin de chaîne, il est préférable de " +"consulter le code source d'APT." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:117 +msgid "stats" +msgstr "stats" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:117 +msgid "" +"<literal>stats</literal> displays some statistics about the cache. No " +"further arguments are expected. Statistics reported are:" +msgstr "" +"La commande <literal>stats</literal> affiche des statistiques à propos du " +"cache. Aucun autre argument n'est attendu. Voici les informations " +"rapportées :" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:120 +msgid "" +"<literal>Total package names</literal> is the number of package names found " +"in the cache." +msgstr "" +"<literal>Total package names</literal> est le nombre de paquets trouvés dans " +"le cache." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:124 +msgid "" +"<literal>Normal packages</literal> is the number of regular, ordinary " +"package names; these are packages that bear a one-to-one correspondence " +"between their names and the names used by other packages for them in " +"dependencies. The majority of packages fall into this category." +msgstr "" +"<literal>Normal packages</literal> est le nombre de paquets simples, " +"ordinaires ; ces paquets tolèrent une correspondance bijective entre " +"leur nom et le nom utilisé par les autres paquets pour les qualifier comme " +"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:130 +msgid "" +"<literal>Pure virtual packages</literal> is the number of packages that " +"exist only as a virtual package name; that is, packages only \"provide\" the " +"virtual package name, and no package actually uses the name. For instance, " +"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " +"package; several packages provide \"mail-transport-agent\", but there is no " +"package named \"mail-transport-agent\"." +msgstr "" +"<literal>Pure virtual packages</literal> est le nombre de paquets qui " +"n'existent que sous la forme d'un nom représentant un paquet virtuel ; " +"ces paquets « fournissent » seulement un nom de paquet virtuel et " +"aucun paquet n'utilise véritablement ce nom. Par exemple, au sein du système " +"Debian GNU/Linux, le nom « mail-transport-agent » est un paquet " +"virtuel pur ; plusieurs paquets peuvent « fournir » ce nom " +"« mail-transport-agent », mais il n'existe aucun paquet nommé « " +"mail-transport-agent »." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:138 +msgid "" +"<literal>Single virtual packages</literal> is the number of packages with " +"only one package providing a particular virtual package. For example, in the " +"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " +"one package, xless, provides \"X11-text-viewer\"." +msgstr "" +"<literal>Single virtual packages</literal> est le nombre de paquets virtuels " +"qui ne peuvent être remplis que par un seul paquet. Par exemple, au sein du " +"système Debian GNU/Linux, « X11-text-viewer » est un paquet " +"virtuel ; seul le paquet « xless » remplit « X11-text-" +"viewer »." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:144 +msgid "" +"<literal>Mixed virtual packages</literal> is the number of packages that " +"either provide a particular virtual package or have the virtual package name " +"as the package name. For instance, in the Debian GNU/Linux system, \"debconf" +"\" is both an actual package, and provided by the debconf-tiny package." +msgstr "" +"<literal>Mixed virtual packages</literal> est le nombre de paquets qui " +"remplissent un paquet virtuel particulier ou dont le nom est un nom de " +"paquet virtuel. Par exemple, au sein du système Debian GNU/Linux, « " +"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:151 +msgid "" +"<literal>Missing</literal> is the number of package names that were " +"referenced in a dependency but were not provided by any package. Missing " +"packages may be in evidence if a full distribution is not accessed, or if a " +"package (real or virtual) has been dropped from the distribution. Usually " +"they are referenced from Conflicts or Breaks statements." +msgstr "" +"<literal>Missing</literal> est le nombre de paquets référencés dans une " +"dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants " +"peuvent être mis en évidence quand on n'accède pas à une distribution " +"complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. " +"Habituellement on les trouve dans les champs « Conflicts »." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:158 +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 " +"total package names. If more than one distribution (both \"stable\" and " +"\"unstable\", for instance), is being accessed, this value can be " +"considerably larger than the number of total package names." +msgstr "" +"<literal>Total distinct versions</literal> est le nombre de versions de " +"paquets trouvées dans le cache ; cette valeur est par conséquent au " +"moins égale au nombre total de paquets. Quand on accède à plus d'une " +"distribution (« stable » et « unstable », par exemple), " +"cette valeur peut être 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:165 +msgid "" +"<literal>Total dependencies</literal> is the number of dependency " +"relationships claimed by all of the packages in the cache." +msgstr "" +"<literal>Total dependencies</literal> est le nombre de relations de " +"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:172 +msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgstr "showsrc <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:173 +msgid "" +"<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." +msgstr "" +"<literal>showsrc</literal> affiche toutes les entrées de paquets source qui " +"correspondent aux noms donnés. Toutes les versions sont affichées et toutes " +"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:178 apt-config.8.xml:83 +msgid "dump" +msgstr "dump" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:179 +msgid "" +"<literal>dump</literal> shows a short listing of every package in the cache. " +"It is primarily for debugging." +msgstr "" +"La commande <literal>dump</literal> affiche un court résumé sur chaque " +"paquet du cache. Elle est d'abord destinée au débogage." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:183 +msgid "dumpavail" +msgstr "dumpavail" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:184 +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 "" +"La commande <literal>dumpavail</literal> affiche sur la sortie standard la " +"liste des paquets disponibles. Elle convient à une utilisation avec &dpkg; " +"et la méthode &dselect; s'en sert." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:188 +msgid "unmet" +msgstr "unmet" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:189 +msgid "" +"<literal>unmet</literal> displays a summary of all unmet dependencies in the " +"package cache." +msgstr "" +"La commande <literal>unmet</literal> affiche un résumé concernant toutes les " +"dépendances absentes dans le cache de paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:193 +msgid "show <replaceable>pkg(s)</replaceable>" +msgstr "show <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:194 +msgid "" +"<literal>show</literal> performs a function similar to <command>dpkg --print-" +"avail</command>; it displays the package records for the named packages." +msgstr "" +"La commande <literal>show</literal> est semblable à <command>dpkg --print-" +"avail</command> ; elle affiche des informations sur les paquets donnés " +"en argument." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:199 +msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgstr "search <replaceable>expression [ expression ... ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:200 +msgid "" +"<literal>search</literal> performs a full text search on all available " +"package lists for the POSIX regex pattern given, see " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " +"the descriptions for an occurrence of the regular expression and prints out " +"the package name and the short description, including virtual package " +"names. If <option>--full</option> is given then output identical to " +"<literal>show</literal> is produced for each matched package, and if " +"<option>--names-only</option> is given then the long description is not " +"searched, only the package name is." +msgstr "" +"La commande <literal>search</literal> recherche l'expression rationnelle " +"donnée en paramètre sur tous les paquets disponibles. Elle cherche une " +"occurrence de la chaîne dans les noms de paquets et dans les descriptions " +"puis elle affiche le nom du paquet et sa description courte. Quand on donne " +"l'option <option>--full</option>, la sortie est identique à <literal>show</" +"literal> pour chaque paquet ; l'option <option>--names-only</option> ne " +"recherche pas la chaîne dans les descriptions longues mais seulement dans " +"les noms de paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:213 +msgid "" +"Separate arguments can be used to specify multiple search patterns that are " +"and'ed together." +msgstr "" +"On peut utiliser des arguments distincts pour indiquer des expressions " +"rationnelles différentes sur lesquelles sera réalisé un « et » " +"logique." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:217 +msgid "depends <replaceable>pkg(s)</replaceable>" +msgstr "depends <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:218 +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 "" +"La commande <literal>depends</literal> affiche la liste de toutes les " +"dépendances d'un paquet et la liste de tous les paquets possibles qui " +"satisfont ces dépendances." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:222 +msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgstr "rdepends <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:223 +msgid "" +"<literal>rdepends</literal> shows a listing of each reverse dependency a " +"package has." +msgstr "" +"La commande <literal>rdepends</literal> affiche la liste de toutes les " +"dépendances inverses d'un paquet." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:227 +msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:228 +msgid "" +"This command prints the name of each package in the system. The optional " +"argument is a prefix match to filter the name list. The output is suitable " +"for use in a shell tab complete function and the output is generated " +"extremely quickly. This command is best used with the <option>--generate</" +"option> option." +msgstr "" +"Cette commande affiche le nom de chaque paquet du système. Un préfixe pour " +"filtrer la liste des noms peut être donné en paramètre. La sortie est " +"adaptée à une utilisation au sein d'une fonction complète de shell ; " +"elle est produite très rapidement. On utilise au mieux cette commande avec " +"l'option <option>--generate</option>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:235 +msgid "dotty <replaceable>pkg(s)</replaceable>" +msgstr "dotty <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:236 +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." +"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result " +"will be a set of nodes and edges representing the relationships between the " +"packages. By default the given packages will trace out all dependent " +"packages; this can produce a very large graph. To limit the output to only " +"the packages listed on the command line, set the <literal>APT::Cache::" +"GivenOnly</literal> option." +msgstr "" +"La commande <literal>dotty</literal> prend une liste de paquets sur la ligne " +"de commande et affiche une sortie appropriée à une utilisation par la " +"commande dotty du paquet <ulink url=\"http://www.research.att.com/sw/tools/" +"graphviz/\">GraphViz</ulink>. Il en résulte un ensemble de noeuds et d'arcs " +"représentant les relations entre les paquets. Par défaut les paquets donnés " +"en argument suivent toutes leurs dépendances, ce qui peut produire un graphe " +"très volumineux. Pour limiter la sortie aux seuls paquets listés sur la " +"ligne de commande, positionnez l'option <literal>APT::Cache::GivenOnly</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:245 +msgid "" +"The resulting nodes will have several shapes; normal packages are boxes, " +"pure provides are triangles, mixed provides are diamonds, missing packages " +"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " +"lines are pre-depends, green lines are conflicts." +msgstr "" +"Les noeuds résultants ont plusieurs formes ; les paquets normaux sont " +"des boîtes, les « provides » purs sont des triangles, les « " +"provides » mixtes sont des diamants et les paquets manquants sont des " +"hexagones. Les boîtes oranges expriment un arrêt de la récursivité [paquet " +"feuille], les lignes bleues représentent des prédépendances et les lignes " +"vertes représentent des conflits." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:250 +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:253 +msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgstr "xvcg <replaceable>paquet(s)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:254 +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 "" +"Identique à <literal>dotty</literal>, mais réservé à xvcg fourni avec <ulink url=" +"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:258 +msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgstr "policy <replaceable>[ paquet(s) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:259 +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 " +"source. Otherwise it prints out detailed information about the priority " +"selection of the named package." +msgstr "" +"<literal>policy</literal> sert à déboguer des problèmes relatifs au fichier " +"des préférences. Sans argument, la commande affiche la priorité de chaque " +"source. Sinon, elle affiche des informations précises sur la priorité du " +"paquet donné en argument." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:265 +msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" +msgstr "madison <replaceable>[ paquet(s) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:266 +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 " +"archive management tool, <literal>madison</literal>. It displays available " +"versions of a package in a tabular format. Unlike the original " +"<literal>madison</literal>, it can only display information for the " +"architecture for which APT has retrieved package lists (<literal>APT::" +"Architecture</literal>)." +msgstr "" +"La commande <literal>madison</literal> d'<literal>apt-cache</literal> " +"cherche à mimer le format de sortie propre à l'outil debian de gestion " +"d'archives, <literal>madison</literal>, ainsi qu'une partie de ses " +"fonctionnalités. Elle affiche les versions disponibles d'un paquet dans un " +"tableau. Contrairement au programme original <literal>madison</literal>, " +"elle n'affiche que des informations concernant l'architecture pour laquelle " +"Apt a lu la liste des paquets disponibles (<literal>APT::Architecture</" +"literal>)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:277 apt-config.8.xml:92 apt-extracttemplates.1.xml:55 +#: apt-ftparchive.1.xml:491 apt-get.8.xml:299 apt-mark.8.xml:73 +#: apt-sortpkgs.1.xml:53 apt.conf.5.xml:373 apt.conf.5.xml:395 +msgid "options" +msgstr "options" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 +msgid "<option>-p</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 +msgid "<option>--pkg-cache</option>" +msgstr "<option>--pkg-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:282 +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::" +"pkgcache</literal>." +msgstr "" +"Indique le fichier servant de cache des paquets. Le cache des paquets est le " +"cache primaire utilisé par toutes les opérations. Élément de " +"configuration : <literal>Dir::Cache::pkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:287 apt-ftparchive.1.xml:534 apt-get.8.xml:356 +#: apt-sortpkgs.1.xml:57 +msgid "<option>-s</option>" +msgstr "<option>-s</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:287 +msgid "<option>--src-cache</option>" +msgstr "<option>--src-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:288 +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 " +"information from remote sources. When building the package cache the source " +"cache is used to avoid reparsing all of the package files. Configuration " +"Item: <literal>Dir::Cache::srcpkgcache</literal>." +msgstr "" +"Indique le fichier servant de cache des sources. Ce cache n'est utilisé que " +"par <literal>gencaches</literal> ; une version des informations sur les " +"paquets, issue d'une analyse de sources distantes, est conservée. " +"Quand le cache des paquets est créé, le cache des sources est utilisé afin " +"d'éviter d'analyser à nouveau tous les paquets. Élément de " +"configuration : <literal>Dir::Cache::srcpkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346 +msgid "<option>-q</option>" +msgstr "<option>-q</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:295 apt-ftparchive.1.xml:508 apt-get.8.xml:346 +msgid "<option>--quiet</option>" +msgstr "<option>--quiet</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:296 +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 " +"<option>-q=#</option> to set the quietness level, overriding the " +"configuration file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Mode silencieux ; produit une sortie pertinente pour l'enregistrement " +"dans un fichier-journal, sans afficher d'indicateur de progression. Un plus " +"grand nombre de q produira un plus grand silence, avec un maximum de 2. Vous " +"pouvez aussi utiliser <option>-q=#</option> pour positionner le niveau de " +"silence, annulant le fichier de configuration. Élément de " +"configuration : <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:302 +msgid "<option>-i</option>" +msgstr "<option>-i</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:302 +msgid "<option>--important</option>" +msgstr "<option>--important</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:303 +msgid "" +"Print only important dependencies; for use with unmet and depends. Causes " +"only Depends and Pre-Depends relations to be printed. Configuration Item: " +"<literal>APT::Cache::Important</literal>." +msgstr "" +"N'affiche que les dépendances importantes ; à utiliser avec les commandes " +"unmet et depends pour n'afficher que les relations Depends et Pre-Depends. Élément de " +"configuration : <literal>APT::Cache::Important</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:308 apt-cdrom.8.xml:120 apt-get.8.xml:313 +msgid "<option>-f</option>" +msgstr "<option>-f</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:308 +msgid "<option>--full</option>" +msgstr "<option>--full</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:309 +msgid "" +"Print full package records when searching. Configuration Item: " +"<literal>APT::Cache::ShowFull</literal>." +msgstr "" +"Affiche la totalité des champs d'information sur le paquet lors d'une " +"recherche. Élément de configuration : <literal>APT::Cache::ShowFull</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:313 apt-cdrom.8.xml:130 +msgid "<option>-a</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:313 +msgid "<option>--all-versions</option>" +msgstr "<option>--all-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:314 +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-" +"versions</option> is specified, only the candidate version will displayed " +"(the one which would be selected for installation). This option is only " +"applicable to the <literal>show</literal> command. Configuration Item: " +"<literal>APT::Cache::AllVersions</literal>." +msgstr "" +"Affiche la totalité des champs d'information pour toutes les versions " +"disponibles : c'est la valeur par défaut. Pour la désactiver, utilisez " +"l'option <option>--no-all-versions</option>. Quand l'option <option>--no-all-" +"versions</option> est choisie, seuls les éléments de la version choisie " +"(celle qui serait installée) seront affichés. Cette option concerne " +"seulement la commande <literal>show</literal>. Élément de " +"configuration : <literal>APT::Cache::AllVersions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:322 +msgid "<option>-g</option>" +msgstr "<option>-g</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:322 +msgid "<option>--generate</option>" +msgstr "<option>--generate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:323 +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</" +"option>. Configuration Item: <literal>APT::Cache::Generate</literal>." +msgstr "" +"Réalise une mise à jour automatique du cache des paquets plutôt que de se " +"servir du cache tel qu'il est. Pour désactiver cette option (option par défaut), " +"utilisez l'option <option>--no-generate</option>. Élément de " +"configuration : <literal>APT::Cache::Generate</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:328 +msgid "<option>--names-only</option>" +msgstr "<option>--names-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:328 apt-cdrom.8.xml:138 +msgid "<option>-n</option>" +msgstr "<option>-n</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:329 +msgid "" +"Only search on the package names, not the long descriptions. Configuration " +"Item: <literal>APT::Cache::NamesOnly</literal>." +msgstr "" +"N'effectue une recherche que sur les noms de paquets et pas sur les " +"descriptions longues. Élément de configuration : <literal>APT::Cache::" +"NamesOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:333 +msgid "<option>--all-names</option>" +msgstr "<option>--all-names</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:334 +msgid "" +"Make <literal>pkgnames</literal> print all names, including virtual packages " +"and missing dependencies. Configuration Item: <literal>APT::Cache::" +"AllNames</literal>." +msgstr "" +"Avec cette option, <literal>pkgnames</literal> affiche tous les noms, les " +"noms des paquets virtuels et les dépendances manquantes. Élément de " +"configuration : <literal>APT::Cache::AllNames</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:339 +msgid "<option>--recurse</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:340 +msgid "" +"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " +"that all packages mentioned are printed once. Configuration Item: " +"<literal>APT::Cache::RecurseDepends</literal>." +msgstr "" +"Avec cette option, <literal>depends</literal> et <literal>rdepends</literal> " +"sont récursives de manière à n'afficher qu'une seule fois les paquets " +"mentionnés. Élément de configuration : <literal>APT::Cache::" +"RecurseDepends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:345 +msgid "<option>--installed</option>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:347 +msgid "" +"Limit the output of <literal>depends</literal> and <literal>rdepends</" +"literal> to packages which are currently installed. Configuration Item: " +"<literal>APT::Cache::Installed</literal>." +msgstr "" +"Cette option limite la sortie de <literal>depends</literal> et de " +"<literal>rdepends</literal> aux paquets qui sont actuellement installés. " +"Élément de configuration : <literal>APT::Cache::Installed</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:352 apt-cdrom.8.xml:149 apt-config.8.xml:97 +#: apt-extracttemplates.1.xml:66 apt-ftparchive.1.xml:546 apt-get.8.xml:534 +#: apt-sortpkgs.1.xml:63 +msgid "&apt-commonoptions;" +msgstr "&apt-commonoptions;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:357 apt-get.8.xml:539 apt-key.8.xml:137 apt.conf.5.xml:824 +msgid "Files" +msgstr "Fichiers" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:359 apt-get.8.xml:541 +msgid "<filename>/etc/apt/sources.list</filename>" +msgstr "<filename>/etc/apt/sources.list</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:360 apt-get.8.xml:542 +msgid "" +"Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::" +"SourceList</literal>." +msgstr "" +"Emplacements où aller chercher les paquets. Élément de configuration : " +"<literal>Dir::Etc::SourceList</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:364 apt-get.8.xml:575 +msgid "<filename>&statedir;/lists/</filename>" +msgstr "<filename>&statedir;/lists/</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:365 apt-get.8.xml:576 +msgid "" +"Storage area for state information for each package resource specified in " +"&sources-list; Configuration Item: <literal>Dir::State::Lists</literal>." +msgstr "" +"Zone de stockage pour les informations qui concernent chaque ressource de " +"paquet spécifiée dans &sources-list; Élément de configuration : " +"<literal>Dir::State::Lists</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:370 apt-get.8.xml:581 +msgid "<filename>&statedir;/lists/partial/</filename>" +msgstr "<filename>&statedir;/lists/partial/</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:371 apt-get.8.xml:582 +msgid "" +"Storage area for state information in transit. Configuration Item: " +"<literal>Dir::State::Lists</literal> (implicit partial)." +msgstr "" +"Zone de stockage pour les informations en transit. Élément de " +"configuration : <literal>Dir::State::Lists</literal> (partial est " +"implicite)." + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:377 apt-cdrom.8.xml:154 apt-config.8.xml:102 +#: apt-extracttemplates.1.xml:73 apt-ftparchive.1.xml:562 apt-get.8.xml:588 +#: apt-key.8.xml:161 apt-mark.8.xml:104 apt-secure.8.xml:180 +#: apt-sortpkgs.1.xml:68 apt.conf.5.xml:828 apt_preferences.5.xml:613 +#: sources.list.5.xml:220 +msgid "See Also" +msgstr "Voir aussi" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:378 +msgid "&apt-conf;, &sources-list;, &apt-get;" +msgstr "&apt-conf;, &sources-list;, &apt-get;." + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:382 apt-cdrom.8.xml:159 apt-config.8.xml:107 +#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:566 apt-get.8.xml:594 +#: apt-mark.8.xml:108 apt-sortpkgs.1.xml:72 +msgid "Diagnostics" +msgstr "Diagnostique" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:383 +msgid "" +"<command>apt-cache</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cache</command> retourne zéro après un déroulement normal et " +"le nombre décimal 100 en cas d'erreur." + +#. type: Content of: <refentry><refentryinfo> +#: apt-cdrom.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"février 2004</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:27 +msgid "apt-cdrom" +msgstr "apt-cdrom" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-cdrom.8.xml:28 +msgid "APT CDROM management utility" +msgstr "Utilitaire de gestion des CD d'APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-cdrom.8.xml:34 +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>point de montage du CD</replaceable></" +"option></arg> <arg><option>-o=<replaceable>option de configuration</" +"replaceable></option></arg> <arg><option>-c=<replaceable>fichier</" +"replaceable></option></arg> <group> <arg>add</arg> <arg>ident</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:47 +msgid "" +"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"available sources. <command>apt-cdrom</command> takes care of determining " +"the structure of the disc as well as correcting for several possible mis-" +"burns and verifying the index files." +msgstr "" +"<command>apt-cdrom</command> est utilisé pour ajouter un nouveau CD à " +"la liste des sources disponibles. <command>apt-cdrom</command> prend soin de " +"déterminer la structure du disque, de corriger de possibles erreurs de " +"gravure et de vérifier les fichiers d'index." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:54 +msgid "" +"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " +"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"must be inserted and scanned separately to account for possible mis-burns." +msgstr "" +"Il est nécessaire d'utiliser <command>apt-cdrom</command> pour ajouter des " +"CD au système APT car cela ne peut être réalisé manuellement. " +"Par ailleurs, chaque disque d'un ensemble de CD doit être séparément " +"inséré et parcouru pour prendre en compte de possibles erreurs de gravure." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:64 +msgid "add" +msgstr "add" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:65 +msgid "" +"<literal>add</literal> is used to add a new disc to the source list. It will " +"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"to scan it and copy the index files. If the disc does not have a proper " +"<filename>disk</filename> directory you will be prompted for a descriptive " +"title." +msgstr "" +"La commande <literal>add</literal> est utilisée pour ajouter un nouveau " +"disque à la liste des sources. Elle démonte le CD, réclame l'insertion " +"d'un disque, parcourt ensuite le disque et copie les fichiers d'index. Si le " +"disque ne possède pas de répertoire <filename>disk/</filename> correct, un " +"titre descriptif est demandé." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:73 +msgid "" +"APT uses a CDROM ID to track which disc is currently in the drive and " +"maintains a database of these IDs in <filename>&statedir;/cdroms.list</" +"filename>" +msgstr "" +"APT utilise un identifiant de CD pour reconnaître le disque qui se " +"trouve actuellement dans le lecteur et maintient une base de données de ces " +"identifiants dans <filename>&statedir;/cdroms.list</filename>." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:80 +msgid "ident" +msgstr "ident" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:81 +msgid "" +"A debugging tool to report the identity of the current disc as well as the " +"stored file name" +msgstr "" +"Cette commande de débogage retourne l'identifiant du disque actuel ainsi que " +"le nom du fichier stocké." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:60 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present. <placeholder type=\"variablelist" +"\" id=\"0\"/>" +msgstr "" +"À moins que l'option <option>-h</option> ou <option>--help</option> ne soit " +"donnée, l'une des commandes suivantes doit être présente. <placeholder type=" +"\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cdrom.8.xml:90 +msgid "Options" +msgstr "Options" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:94 apt-ftparchive.1.xml:502 apt-get.8.xml:308 +msgid "<option>-d</option>" +msgstr "<option>-d</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:94 +msgid "<option>--cdrom</option>" +msgstr "<option>--cdrom</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:95 +msgid "" +"Mount point; specify the location to mount the cdrom. This mount point must " +"be listed in <filename>/etc/fstab</filename> and properly configured. " +"Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgstr "" +"Point de montage ; spécifie l'emplacement de montage du CD. Ce " +"point de montage doit être spécifié dans <filename>/etc/fstab</filename> et " +"correctement configuré. Élément de configuration : <literal>Acquire::" +"cdrom::mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:103 +msgid "<option>-r</option>" +msgstr "<option>-r</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:103 +msgid "<option>--rename</option>" +msgstr "<option>--rename</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:104 +msgid "" +"Rename a disc; change the label of a disk or override the disks given label. " +"This option will cause <command>apt-cdrom</command> to prompt for a new " +"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +msgstr "" +"Change le nom d'un disque ; change le nom d'un disque ou remplace un disque pour un nom " +"donné. Cette option oblige <command>apt-cdrom</command> à " +"demander un nouveau nom à l'utilisateur. Élément de configuration : " +"<literal>APT::CDROM::Rename</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:112 apt-get.8.xml:327 +msgid "<option>-m</option>" +msgstr "<option>-m</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:112 +msgid "<option>--no-mount</option>" +msgstr "<option>--no-mount</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:113 +msgid "" +"No mounting; prevent <command>apt-cdrom</command> from mounting and " +"unmounting the mount point. Configuration Item: <literal>APT::CDROM::" +"NoMount</literal>." +msgstr "" +"Pas de montage ; empêche <command>apt-cdrom</command> de monter ou " +"démonter le point de montage. Élément de configuration : <literal >APT::" +"CDROM::NoMount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:120 +msgid "<option>--fast</option>" +msgstr "<option>--fast</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:121 +msgid "" +"Fast Copy; Assume the package files are valid and do not check every " +"package. This option should be used only if <command>apt-cdrom</command> has " +"been run on this disc before and did not detect any errors. Configuration " +"Item: <literal>APT::CDROM::Fast</literal>." +msgstr "" +"Copie rapide ; suppose que les fichiers de paquets sont valables et ne vérifie pas " +"chaque paquet. Cette option ne devrait être utilisée que si <command>apt-" +"cdrom</command> a préalablement utilisé ce disque et n'a trouvé aucune " +"erreur. Élément de configuration : <literal>APT::CDROM::Fast</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:130 +msgid "<option>--thorough</option>" +msgstr "<option>--thorough</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:131 +msgid "" +"Thorough Package Scan; This option may be needed with some old Debian " +"1.1/1.2 discs that have Package files in strange places. It takes much " +"longer to scan the CD but will pick them all up." +msgstr "" +"Parcours minutieux des paquets ; cette option peut être nécessaire avec " +"des CD d'anciens systèmes Debian 1.1 ou 1.2 dont les fichiers Packages " +"sont situés dans des endroits inhabituels. Il faudra plus de temps pour " +"parcourir le CD mais tous les paquets seront repérés." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:139 apt-get.8.xml:358 +msgid "<option>--just-print</option>" +msgstr "<option>--just-print</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:140 apt-get.8.xml:360 +msgid "<option>--recon</option>" +msgstr "<option>--recon</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:141 apt-get.8.xml:361 +msgid "<option>--no-act</option>" +msgstr "<option>--no-act</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:142 +msgid "" +"No Changes; Do not change the &sources-list; file and do not write index " +"files. Everything is still checked however. Configuration Item: " +"<literal>APT::CDROM::NoAct</literal>." +msgstr "" +"Aucune modification ; ne pas modifier le fichier &sources-list; ni les " +"fichiers d'index. Cependant, tout est vérifié. Élément de " +"configuration : <literal>APT::CDROM::NoAct</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:155 +msgid "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-conf;, &apt-get;, &sources-list;." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:160 +msgid "" +"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cdrom</command> renvoie zéro après un déroulement normal, et " +"le nombre décimal 100 en cas d'erreur." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-config.8.xml:22 apt-config.8.xml:28 +msgid "apt-config" +msgstr "apt-config" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-config.8.xml:29 +msgid "APT Configuration Query program" +msgstr "Programme d'interrogation de la configuration d'APT" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-config.8.xml:35 +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>option de configuration</replaceable></option></arg> " +"<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group " +"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:47 +msgid "" +"<command>apt-config</command> is an internal program used by various " +"portions of the APT suite to provide consistent configurability. It accesses " +"the main configuration file <filename>/etc/apt/apt.conf</filename> in a " +"manner that is easy to use by scripted applications." +msgstr "" +"<command>apt-config</command> est un programme interne utilisé par " +"différents composants d'APT ; il offre la possibilité d'une " +"configuration cohérente et permet aux applications conçues sous forme de " +"script une utilisation simple du fichier de configuration principal " +"<filename>/etc/apt/apt.conf</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:52 apt-ftparchive.1.xml:70 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present." +msgstr "" +"À moins que l'option <option>-h</option> ou <option>--help</option> ne soit " +"donnée, l'une des commandes suivantes doit être présente." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:57 +msgid "shell" +msgstr "shell" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:59 +msgid "" +"shell is used to access the configuration information from a shell script. " +"It is given pairs of arguments, the first being a shell variable and the " +"second the configuration value to query. As output it lists a series of " +"shell assignments commands for each present value. In a shell script it " +"should be used like:" +msgstr "" +"Le terme shell est utilisé pour accéder aux informations de configuration " +"depuis un script shell. Deux arguments doivent lui être donnés ; le " +"premier est une variable du shell et le second une valeur de configuration à " +"demander. La sortie standard consiste en une liste de commandes " +"d'assignation de shell pour chaque valeur présente. Dans un script shell, " +"cette commande devrait être utilisée comme suit :" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-config.8.xml:67, no-wrap +msgid "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" +msgstr "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::Options`\n" +"eval $RES\n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:72 +msgid "" +"This will set the shell environment variable $OPTS to the value of MyApp::" +"options with a default of <option>-f</option>." +msgstr "" +"La variable d'environnement du shell $OPTS sera définie par la valeur de " +"MyApp::Options ou, par défaut, la valeur -f." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:76 +msgid "" +"The configuration item may be postfixed with a /[fdbi]. f returns file " +"names, d returns directories, b returns true or false and i returns an " +"integer. Each of the returns is normalized and verified internally." +msgstr "" +"L'élément de configuration peut être suivi par /[fdbi]. « f » " +"renvoie un nom de fichier, « d » un nom de répertoire, « " +"b » renvoie « true » ou « false » et « i » " +"renvoie un entier. Chacune de ses valeurs est normalisée et vérifiée." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:85 +msgid "Just show the contents of the configuration space." +msgstr "Affiche seulement le contenu de l'espace de configuration." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 +#: apt-mark.8.xml:105 apt-sortpkgs.1.xml:69 +msgid "&apt-conf;" +msgstr "&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:108 +msgid "" +"<command>apt-config</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-config</command> retourne zéro après un déroulement normal, et " +"le nombre 100 en cas d'erreur." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:28 +msgid "apt-extracttemplates" +msgstr "apt-extracttemplates" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 +msgid "1" +msgstr "1" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-extracttemplates.1.xml:29 +msgid "Utility to extract DebConf config and templates from Debian packages" +msgstr "" +"Outil d'extraction des textes de configuration pour " +"DebConf dans un paquet Debian" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-extracttemplates.1.xml:35 +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>répertoire temporaire</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichier</" +"replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:43 +msgid "" +"<command>apt-extracttemplates</command> will take one or more Debian package " +"files as input and write out (to a temporary directory) all associated " +"config scripts and template files. For each passed in package that contains " +"config scripts and templates, one line of output will be generated in the " +"format:" +msgstr "" +"<command>Apt-extracttemplates</command> prend un ou plusieurs paquets Debian " +"en paramètre et extrait (dans un répertoire temporaire) tous les scripts et " +"guides de configuration associés. Pour chaque paquet traité contenant des " +"scripts et guides de configuration, une ligne est affichée au format " +"suivant :" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:48 +msgid "package version template-file config-script" +msgstr "paquet version guide-de-configuration script-de-configuration" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:49 +msgid "" +"template-file and config-script are written to the temporary directory " +"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</" +"literal>) directory, with filenames of the form <filename>package.template." +"XXXX</filename> and <filename>package.config.XXXX</filename>" +msgstr "" +"Les scripts et guides de configuration sont écrits dans le répertoire " +"temporaire indiqué par l'option <option>-t</option> ou <option>--tempdir</" +"option> (<literal>APT::ExtractTemplates::TempDir</literal>) ; les noms " +"de fichier sont de la forme <filename>package.template.XXXX</filename> ou " +"<filename>package.config.XXXX</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:59 apt-get.8.xml:468 +msgid "<option>-t</option>" +msgstr "<option>-t</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:59 +msgid "<option>--tempdir</option>" +msgstr "<option>--tempdir</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-extracttemplates.1.xml:61 +msgid "" +"Temporary directory in which to write extracted debconf template files and " +"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</" +"literal>" +msgstr "" +"Répertoire temporaire dans lequel écrire les scripts et guides de " +"configuration pour Debconf. Élément de configuration : <literal>APT::" +"ExtractTemplates::TempDir</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:78 +msgid "" +"<command>apt-extracttemplates</command> returns zero on normal operation, " +"decimal 100 on error." +msgstr "" +"<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, " +"le nombre 100 en cas d'erreur." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:28 +msgid "apt-ftparchive" +msgstr "apt-ftparchive" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-ftparchive.1.xml:29 +msgid "Utility to generate index files" +msgstr "Outil de création de fichiers d'index" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-ftparchive.1.xml:35 +msgid "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> " +"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice=" +"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></" +"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></" +"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</" +"replaceable></arg> <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" +"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" +msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg><arg> " +"<option>--md5</option></arg><arg> <option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o=<replaceable>option de configuration</replaceable></" +"option></arg> <arg><option>-c=<replaceable>fichier</replaceable></option></" +"arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>chemin</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></arg></" +"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>chemin</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>préfixe-de-chemin</replaceable></arg></arg></" +"arg> <arg>contents <arg choice=\"plain\"><replaceable>chemin</replaceable></" +"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>chemin</" +"replaceable></arg></arg> <arg>generate <arg choice=\"plain" +"\"><replaceable>fichier-de-configuration</replaceable></arg><arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>section</replaceable></arg></arg> " +"<arg>clean <arg choice=\"plain\"><replaceable>fichier-de-configuration</" +"replaceable></arg></arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:55 +msgid "" +"<command>apt-ftparchive</command> is the command line tool that generates " +"the index files that APT uses to access a distribution source. The index " +"files should be generated on the origin site based on the content of that " +"site." +msgstr "" +"<command>apt-ftparchive</command> est l'outil en ligne de commande qui crée " +"les index dont APT se sert pour accéder aux sources des distributions. Un " +"index doit être créé pour un site et basé sur le contenu de ce site." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:59 +msgid "" +"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " +"program, incorporating its entire functionality via the <literal>packages</" +"literal> command. It also contains a contents file generator, " +"<literal>contents</literal>, and an elaborate means to 'script' the " +"generation process for a complete archive." +msgstr "" +"<command>apt-ftparchive</command> est un ensemble comprenant le programme " +"&dpkg-scanpackages; et toutes ses fonctionnalités via la commande " +"<literal>packages</literal> ; il comprend aussi un générateur de " +"fichier « Contents », la commande <literal>contents</literal>, et " +"une technique élaborée pour « scripter » le processus de création " +"d'une archive complète." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:65 +msgid "" +"Internally <command>apt-ftparchive</command> can make use of binary " +"databases to cache the contents of a .deb file and it does not rely on any " +"external programs aside from &gzip;. When doing a full generate it " +"automatically performs file-change checks and builds the desired compressed " +"output files." +msgstr "" +"<command>Apt-ftparchive</command> peut utiliser lui-même des bases de " +"données binaires pour « cacher » le contenu d'un fichier ." +"deb ; il n'a pas besoin de programmes extérieurs, sauf &gzip;. Lors " +"d'une exécution, il vérifie les changements dans les fichiers et crée les " +"fichiers compressés voulus." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:74 +msgid "packages" +msgstr "packages" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:76 +msgid "" +"The packages command generates a package file from a directory tree. It " +"takes the given directory and recursively searches it for .deb files, " +"emitting a package record to stdout for each. This command is approximately " +"equivalent to &dpkg-scanpackages;." +msgstr "" +"La commande <literal>packages</literal> crée un fichier « " +"Packages » à partir d'une arborescence. Elle recherche récursivement à " +"travers le répertoire donné les fichiers .deb et, pour chaque fichier " +"trouvé, envoie une entrée pour ce paquet sur la sortie standard. Cette " +"commande est approximativement équivalente à &dpkg-scanpackages;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:81 apt-ftparchive.1.xml:105 +msgid "The option <option>--db</option> can be used to specify a binary caching DB." +msgstr "" +"On peut se servir de l'option <option>--db</option> pour demander un cache " +"binaire." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:84 +msgid "sources" +msgstr "sources" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:86 +msgid "" +"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, emitting a source record to stdout for each. This command is " +"approximately equivalent to &dpkg-scansources;." +msgstr "" +"La commande <literal>sources</literal> crée un index des sources à partir " +"d'une arborescence. Elle recherche récursivement à travers le répertoire " +"donné les fichiers .dsc et, pour chaque fichier trouvé, envoie une entrée " +"pour ce paquet sur la sortie standard. Cette commande est approximativement " +"équivalente à &dpkg-scansources;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:91 +msgid "" +"If an override file is specified then a source override file will be looked " +"for with an extension of .src. The --source-override option can be used to " +"change the source override file that will be used." +msgstr "" +"Quand on précise un fichier « override », c'est un fichier source " +"avec une extension .src qui est recherché. On peut se servir de l'option " +"<option>--source-override</option> pour changer de fichier source d'« " +"override »." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:96 +msgid "contents" +msgstr "contents" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:98 +msgid "" +"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, and reads the file list from each file. It then sorts and " +"writes to stdout the list of files matched to packages. Directories are not " +"written to the output. If multiple packages own the same file then each " +"package is separated by a comma in the output." +msgstr "" +"La commande <literal>contents</literal> crée un fichier « " +"Contents » à partir d'une arborescence. Elle recherche récursivement à " +"travers le répertoire donné les fichiers .deb et, pour chaque fichier " +"trouvé, lit la liste des fichiers. Elle trie la liste des fichiers " +"correspondant à des paquets et l'envoie sur la sortie standard. Les " +"répertoires ne font pas partie du résultat. Quand un fichier appartient à " +"plusieurs paquets, une virgule sépare les paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:108 +msgid "release" +msgstr "release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:110 +msgid "" +"The <literal>release</literal> command generates a Release file from a " +"directory tree. It recursively searches the given directory for Packages, " +"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " +"md5sum.txt files. It then writes to stdout a Release file containing an MD5 " +"digest and SHA1 digest for each file." +msgstr "" +"La commande <literal>release</literal> crée un fichier Releases à partir " +"d'un répertoire. Elle cherche récursivement dans ce répertoire les fichiers " +"Packages, Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, " +"Release et md5sum.txt. Elle envoie alors un fichier Release sur la sortie " +"standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:117 +msgid "" +"Values for the additional metadata fields in the Release file are taken from " +"the corresponding variables under <literal>APT::FTPArchive::Release</" +"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal>." +msgstr "" +"La valeur des autres champs du fichier Release est tirée de la valeur " +"correspondante dans <literal>APT::FTPArchive::Release</literal>, p. ex. " +"<literal>APT::FTPArchive::Release::Origin</literal>. Les champs reconnus " +"sont : <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</" +"literal>, <literal>Version</literal>, <literal>Codename</literal>, " +"<literal>Date</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:127 +msgid "generate" +msgstr "generate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:129 +msgid "" +"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 provides a flexible means of specifying which index files " +"are built from which directories, as well as providing a simple means of " +"maintaining the required settings." +msgstr "" +"La commande <literal>generate</literal> est conçue pour être exécutable par " +"le programme cron et elle crée un index en suivant le fichier de " +"configuration donné. Le langage de configuration fournit un moyen souple de " +"préciser index et répertoires aussi bien que les paramètres requis." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:136 apt-get.8.xml:272 +msgid "clean" +msgstr "clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:138 +msgid "" +"The <literal>clean</literal> command tidies the databases used by the given " +"configuration file by removing any records that are no longer necessary." +msgstr "" +"La commande <literal>clean</literal> nettoie les bases de données utilisées " +"par le fichier de configuration en supprimant les enregistrements qui ne " +"sont plus nécessaires." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:144 +msgid "The Generate Configuration" +msgstr "Configuration de la commande generate" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:146 +msgid "" +"The <literal>generate</literal> command uses a configuration file to " +"describe the archives that are going to be generated. It follows the typical " +"ISC configuration format as seen in ISC tools like bind 8 and dhcpd. &apt-" +"conf; contains a description of the syntax. Note that the generate " +"configuration is parsed in sectional manner, but &apt-conf; is parsed in a " +"tree manner. This only effects how the scope tag is handled." +msgstr "" +"La commande <literal>generate</literal> utilise un fichier de configuration " +"pour décrire l'archive qui va être créée. Le format de ce fichier est le " +"format ISC classique utilisé par des outils ISC comme bind 8 et dhcpd. Le " +"fichier &apt-conf; décrit ce format. Il faut noter que l'analyse de ce " +"fichier se fait par section tandis que celle d'&apt-conf; se fait par " +"arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:154 +msgid "The generate configuration has 4 separate sections, each described below." +msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:156 +msgid "Dir Section" +msgstr "La section Dir" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:158 +msgid "" +"The <literal>Dir</literal> section defines the standard directories needed " +"to locate the files required during the generation process. These " +"directories are prepended to certain relative paths defined in later " +"sections to produce a complete an absolute path." +msgstr "" +"La section <literal>Dir</literal> définit les répertoires standards où " +"situer les fichiers nécessaires au processus de création. Ces répertoires " +"sont précédés de chemins relatifs définis dans les sections suivantes de " +"manière à produire un chemin absolu et complet." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:163 +msgid "ArchiveDir" +msgstr "ArchiveDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:165 +msgid "" +"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." +msgstr "" +"Indique la racine de l'archive FTP ; Pour une configuration Debian " +"classique, c'est le répertoire qui contient le fichier <filename>ls-LR</" +"filename> et les noeuds des distributions." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:170 +msgid "OverrideDir" +msgstr "OverrideDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:172 +msgid "Specifies the location of the override files." +msgstr "Indique l'emplacement des fichiers d'« override »." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:175 +msgid "CacheDir" +msgstr "CacheDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:177 +msgid "Specifies the location of the cache files" +msgstr "Indique l'emplacement des fichiers de cache." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:180 +msgid "FileListDir" +msgstr "FileListDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:182 +msgid "" +"Specifies the location of the file list files, if the <literal>FileList</" +"literal> setting is used below." +msgstr "" +"Indique l'emplacement des fichiers contenant la liste des fichiers (si on se " +"sert de la valeur <literal>FileList</literal> définie plus bas)." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:188 +msgid "Default Section" +msgstr "La section Default" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:190 +msgid "" +"The <literal>Default</literal> section specifies default values, and " +"settings that control the operation of the generator. Other sections may " +"override these defaults with a per-section setting." +msgstr "" +"La section <literal>Default</literal> précise les valeurs par défaut et les " +"paramètres qui contrôlent la marche du générateur. Ces valeurs peuvent être " +"annulées dans d'autres sections (paramètrage par section)." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:194 +msgid "Packages::Compress" +msgstr "Packages::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:196 +msgid "" +"Sets the default compression schemes to use for the Package index files. It " +"is a string that contains a space separated list of at least one of: '.' (no " +"compression), 'gzip' and 'bzip2'. The default for all compression schemes is " +"'. gzip'." +msgstr "" +"Indique comment sont compressés les fichiers d'index. C'est une chaîne qui " +"contient des valeurs séparées par des espaces ; elle contient au moins " +"l'une des valeurs suivantes : « . » (pas de compression), " +"« gzip », « bzip2 ». Par défaut, c'est la chaîne « . " +"gzip »." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:202 +msgid "Packages::Extensions" +msgstr "Packages::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:204 +msgid "" +"Sets the default list of file extensions that are package files. This " +"defaults to '.deb'." +msgstr "" +"Indique la liste par défaut des extensions de fichier qui constituent des " +"paquets. Par défaut, c'est « .deb »." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:208 +msgid "Sources::Compress" +msgstr "Sources::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:210 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Sources files." +msgstr "" +"Identique à <literal>Packages::Compress</literal> mais précise comment sont " +"compressés les fichiers sources." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:214 +msgid "Sources::Extensions" +msgstr "Sources::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:216 +msgid "" +"Sets the default list of file extensions that are source files. This " +"defaults to '.dsc'." +msgstr "" +"Indique la liste par défaut des extensions de fichier qui constituent des " +"fichiers sources. Par défaut, c'est « .dsc »." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:220 +msgid "Contents::Compress" +msgstr "Contents::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:222 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Contents files." +msgstr "" +"Identique à <literal>Packages::Compress</literal> mais précise comment sont " +"compressés les fichiers « Contents »." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:226 +msgid "DeLinkLimit" +msgstr "DeLinkLimit" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:228 +msgid "" +"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." +msgstr "" +"Indique le nombre de kilo-octets à délier (et à remplacer par des liens en " +"dur) pour chaque exécution. On s'en sert, pour chaque section, avec le " +"paramètre <literal>External-Links</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:233 +msgid "FileMode" +msgstr "FileMode" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:235 +msgid "" +"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." +msgstr "" +"Indique le système de permissions des fichiers d'index créés. Par défaut, " +"c'est le mode 0644. Tous les fichiers d'index ont ce mode et le masque " +"utilisateur (umasq) est ignoré." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:242 +msgid "TreeDefault Section" +msgstr "La section TreeDefault" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:244 +msgid "" +"Sets defaults specific to <literal>Tree</literal> sections. All of these " +"variables are substitution variables and have the strings $(DIST), " +"$(SECTION) and $(ARCH) replaced with their respective values." +msgstr "" +"Indique les valeurs par défaut particulières à la section <literal>Tree</" +"literal>. Toutes ces variables sont des variables de substitution ; les " +"chaînes $(DIST), $(SECTION) et $(ARCH) sont remplacées par leur valeur " +"respective." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:249 +msgid "MaxContentsChange" +msgstr "MaxContentsChange" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:251 +msgid "" +"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." +msgstr "" +"Indique le nombre de kilo-octets de fichiers « Contents » qui sont " +"créés chaque jour. Les fichiers « Contents » sont tirés au sort " +"selon le système <emphasis>round-robin</emphasis> de manière que, sur " +"plusieurs jours, tous soient reconstruits." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:256 +msgid "ContentsAge" +msgstr "ContentsAge" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:258 +msgid "" +"Controls the number of days a contents file is allowed to be checked without " +"changing. If this limit is passed the mtime of the contents file is updated. " +"This case can occur if the package file is changed in such a way that does " +"not result in a new contents file [override edit for instance]. A hold off " +"is allowed in hopes that new .debs will be installed, requiring a new file " +"anyhow. The default is 10, the units are in days." +msgstr "" +"Contrôle le nombre de jours pendant lequel un fichier « Contents » " +"peut être utilisé sans actualisation. Quand cette limite est franchie, le " +"« mtime » du fichier « Contents » est mis à jour. Cela " +"peut arriver quand un fichier est modifié sans que cela modifie le fichier " +"« Contents » (modification par « override » par exemple). " +"Un délai est permis dans l'espoir que de nouveaux « .deb » seront " +"installés, exigeant un nouveau « Contents ». Par défaut ce nombre " +"vaut 10, l'unité étant le jour." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:267 +msgid "Directory" +msgstr "Directory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:269 +msgid "" +"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename>" +msgstr "" +"Indique la racine de l'arborescence des « .deb ». Par défaut, c'est " +"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:273 +msgid "SrcDirectory" +msgstr "SrcDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:275 +msgid "" +"Sets the top of the source package directory tree. Defaults to <filename>" +"$(DIST)/$(SECTION)/source/</filename>" +msgstr "" +"Indique la racine de l'arborescence des paquets source. Par défaut, c'est " +"<filename>$(DIST)/$(SECTION)/source/</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:279 apt-ftparchive.1.xml:405 +msgid "Packages" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:281 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"binary-$(ARCH)/Packages</filename>" +msgstr "" +"Indique le fichier « Packages » créé. Par défaut, c'est <filename>" +"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:285 apt-ftparchive.1.xml:410 +msgid "Sources" +msgstr "Sources" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:287 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"source/Sources</filename>" +msgstr "" +"Indique le fichier « Packages » crée. Par défaut, c'est <filename>" +"$(DIST)/$(SECTION)/source/Sources</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:291 +msgid "InternalPrefix" +msgstr "InternalPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:293 +msgid "" +"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>" +msgstr "" +"Indique un préfixe de chemin ; ce préfixe fait qu'un lien symbolique " +"sera considéré comme un lien interne plutôt que comme un lien externe. Par " +"défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:298 apt-ftparchive.1.xml:416 +msgid "Contents" +msgstr "Contents" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:300 +msgid "" +"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" +"</filename>. If this setting causes multiple Packages files to map onto a " +"single Contents file (such as the default) then <command>apt-ftparchive</" +"command> will integrate those package files together automatically." +msgstr "" +"Indique le fichier « Contents » créé. Par défaut, c'est <filename>" +"$(DIST)/Contents-$(ARCH)</filename>. Quand le paramètrage fait que " +"différents fichiers « Packages » se réfèrent à un seul fichier " +"« Contents », <command>apt-ftparchive</command> les intègre " +"automatiquement." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:307 +msgid "Contents::Header" +msgstr "Contents::Header" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:309 +msgid "Sets header file to prepend to the contents output." +msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:312 apt-ftparchive.1.xml:441 +msgid "BinCacheDB" +msgstr "BinCacheDB" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:314 +msgid "" +"Sets the binary cache database to use for this section. Multiple sections " +"can share the same database." +msgstr "" +"Indique la base de données binaire servant de cache pour cette section. " +"Différentes sections peuvent partager cette base de données." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:318 +msgid "FileList" +msgstr "FileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:320 +msgid "" +"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." +msgstr "" +"Indique qu'au lieu de lire l'arborescence, <command>apt-ftparchive</command> " +"doit lire la liste de fichiers dans le fichier donné en paramètre. Les noms " +"relatifs sont préfixés par le répertoire de l'archive." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:325 +msgid "SourceFileList" +msgstr "SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:327 +msgid "" +"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. This is used " +"when processing source indexes." +msgstr "" +"Indique qu'au lieu de lire l'arborescence, <command>apt-ftparchive</command> " +"doit lire la liste de fichiers dans le fichier donné en paramètre. Les noms " +"relatifs sont préfixés par le répertoire de l'archive. On s'en sert pour " +"traiter les index de sources." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:335 +msgid "Tree Section" +msgstr "La section Tree" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:337 +msgid "" +"The <literal>Tree</literal> section defines a standard Debian file tree " +"which consists of a base directory, then multiple sections in that base " +"directory and finally multiple Architectures in each section. The exact " +"pathing used is defined by the <literal>Directory</literal> substitution " +"variable." +msgstr "" +"La section <literal>Tree</literal> définit une arborescence debian classique " +"avec un répertoire de base, différentes sections dans ce répertoire et " +"différentes architectures dans chaque section. Le chemin exact est défini " +"par la variable de substitution <literal>Directory</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:342 +msgid "" +"The <literal>Tree</literal> section takes a scope tag which sets the " +"<literal>$(DIST)</literal> variable and defines the root of the tree (the " +"path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " +"setting such as <filename>dists/woody</filename>." +msgstr "" +"La section <literal>Tree</literal> accepte une étiquette de visée (scope " +"tag) qui détermine la variable <literal>$(DIST)</literal> et la racine de " +"l'arborescence (le chemin est préfixé par <literal>ArchiveDir</literal>). " +"C'est par exemple : <filename>dists/woody</filename>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:347 +msgid "" +"All of the settings defined in the <literal>TreeDefault</literal> section " +"can be use in a <literal>Tree</literal> section as well as three new " +"variables." +msgstr "" +"Tous les paramètres définis dans la section <literal>TreeDefault</literal> " +"peuvent s'utiliser dans la section <literal>Tree</literal> ainsi que les " +"trois nouvelles variables suivantes." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:350 +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to:" +msgstr "" +"Quand il exécute la section <literal>Tree</literal>, <command>apt-" +"ftparchive</command> agit ainsi :" + +#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#: apt-ftparchive.1.xml:353, no-wrap +msgid "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +msgstr "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:359 +msgid "Sections" +msgstr "Sections" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:361 +msgid "" +"This is a space separated list of sections which appear under the " +"distribution, typically this is something like <literal>main contrib non-" +"free</literal>" +msgstr "" +"C'est une liste de sections séparées par des espaces qui appartiennent à une " +"distribution ; classiquement, on trouve <literal>main contrib non-free</" +"literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:366 +msgid "Architectures" +msgstr "Architectures" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:368 +msgid "" +"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." +msgstr "" +"C'est une liste de toutes les architectures qui appartiennent à chaque " +"section. L'architecture spéciale « source » indique que " +"l'arborescence est une arborescence de sources." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:373 apt-ftparchive.1.xml:421 +msgid "BinOverride" +msgstr "BinOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:375 +msgid "" +"Sets the binary override file. The override file contains section, priority " +"and maintainer address information." +msgstr "" +"Indique le fichier binaire d'« override ». Ce fichier contient des " +"informations sur la section, la priorité et le responsable du paquet." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:379 apt-ftparchive.1.xml:426 +msgid "SrcOverride" +msgstr "SrcOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:381 +msgid "" +"Sets the source override file. The override file contains section " +"information." +msgstr "" +"Indique le fichier source d'« override ». Ce fichier contient des " +"informations sur la section." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:385 apt-ftparchive.1.xml:431 +msgid "ExtraOverride" +msgstr "ExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 +msgid "Sets the binary extra override file." +msgstr "Indique un autre fichier d'« override » pour les binaires." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:390 apt-ftparchive.1.xml:436 +msgid "SrcExtraOverride" +msgstr "SrcExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 +msgid "Sets the source extra override file." +msgstr "Indique un autre fichier d'« override » pour les sources." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:397 +msgid "BinDirectory Section" +msgstr "La section BinDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:399 +msgid "" +"The <literal>bindirectory</literal> section defines a binary directory tree " +"with no special structure. The scope tag specifies the location of the " +"binary directory and the settings are similar to the <literal>Tree</literal> " +"section with no substitution variables or <literal>Section</" +"literal><literal>Architecture</literal> settings." +msgstr "" +"La section <literal>bindirectory</literal> définit une arborescence binaire " +"sans structure particulière. L'étiquette de visée (scope tag) indique " +"l'emplacement du répertoire binaire et le paramètrage est identique à celui " +"pour la section <literal>Tree</literal> sans substitution de variables ou au " +"paramètrage de <literal>Section</literal><literal>Architecture</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:407 +msgid "Sets the Packages file output." +msgstr "Définit le fichier « Packages » créé." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:412 +msgid "" +"Sets the Sources file output. At least one of <literal>Packages</literal> or " +"<literal>Sources</literal> is required." +msgstr "" +"Définit le fichier « Sources » créé. L'un des deux fichiers, " +"<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:418 +msgid "Sets the Contents file output. (optional)" +msgstr "Définit le fichier « Contents » créé." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:423 +msgid "Sets the binary override file." +msgstr "Définit le fichier d'« override » pour les binaires." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:428 +msgid "Sets the source override file." +msgstr "Définit le fichier d'« override » pour les sources." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:443 +msgid "Sets the cache DB." +msgstr "Définit la base de données cache." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:446 +msgid "PathPrefix" +msgstr "PathPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:448 +msgid "Appends a path to all the output paths." +msgstr "Ajoute un chemin à tous les chemins créés." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:451 +msgid "FileList, SourceFileList" +msgstr "FileList, SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:453 +msgid "Specifies the file list file." +msgstr "Définit le fichier contenant la liste des fichiers." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:460 +msgid "The Binary Override File" +msgstr "Le fichier d'« Override » pour les binaires." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:461 +msgid "" +"The binary override file is fully compatible with &dpkg-scanpackages;. It " +"contains 4 fields separated by spaces. The first field is the package name, " +"the second is the priority to force that package to, the third is the the " +"section to force that package to and the final field is the maintainer " +"permutation field." +msgstr "" +"Le fichier d'« Override » est pleinement compatible avec &dpkg-" +"scanpackages;. Il contient quatre champs séparés par des espaces. Le premier " +"est le nom du paquet ; le deuxième est la priorité à donner à ce " +"paquet ; le troisième est sa section et le dernier champ est un champ " +"pour changer le nom du responsable de paquet." + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:467, no-wrap +msgid "old [// oldn]* => new" +msgstr "old [// oldn]* => new" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:469, no-wrap +msgid "new" +msgstr "new" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:466 +msgid "" +"The general form of the maintainer field is: <placeholder type=" +"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " +"id=\"1\"/> The first form allows a double-slash separated list of old email " +"addresses to be specified. If any of those are found then new is substituted " +"for the maintainer field. The second form unconditionally substitutes the " +"maintainer field." +msgstr "" +"Le champ du responsable est de cette forme : <placeholder type=" +"\"literallayout\" id=\"0\"/> ou simplement, <placeholder type=\"literallayout" +"\" id=\"1\"/> La première forme permet de spécifier de vieilles adresses " +"dans une liste (le séparateur est la double barre oblique). Si l'une de ces " +"deux formes est rencontrée, la valeur de new remplace la valeur du champ. La " +"deuxième forme remplace inconditionnellement le champ." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:477 +msgid "The Source Override File" +msgstr "Le fichier d'« Override » pour les sources" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:479 +msgid "" +"The source override file is fully compatible with &dpkg-scansources;. It " +"contains 2 fields separated by spaces. The first fields is the source " +"package name, the second is the section to assign it." +msgstr "" +"Le fichier d'« Override » est pleinement compatible avec &dpkg-" +"scansources;. Il contient deux champs. Le premier est le nom du paquet " +"source ; le second, sa section." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:484 +msgid "The Extra Override File" +msgstr "Le fichier supplémentaire d'« Override »" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:486 +msgid "" +"The extra override file allows any arbitrary tag to be added or replaced in " +"the output. It has 3 columns, the first is the package, the second is the " +"tag and the remainder of the line is the new value." +msgstr "" +"Le fichier supplémentaire d'« Override » permet d'ajouter ou de " +"remplacer des étiquettes sur la sortie. Il possède trois colonnes : la " +"première représente le paquet, la seconde est une étiquette et la troisième " +"en fin de ligne est la nouvelle valeur." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:495 +msgid "<option>--md5</option>" +msgstr "<option>--md5</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:497 +msgid "" +"Generate MD5 sums. This defaults to on, when turned off the generated index " +"files will not have MD5Sum fields where possible. Configuration Item: " +"<literal>APT::FTPArchive::MD5</literal>" +msgstr "" +"Créer la somme de contrôle MD5. Cette option est activée par défaut. Quand " +"elle est désactivée, les fichiers d'index n'ont pas les champs MD5Sum là où " +"c'est possible. Élément de configuration : <literal>APT::FTPArchive::" +"MD5</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:502 +msgid "<option>--db</option>" +msgstr "<option>--db</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:504 +msgid "" +"Use a binary caching DB. This has no effect on the generate command. " +"Configuration Item: <literal>APT::FTPArchive::DB</literal>." +msgstr "" +"Utiliser une base de données binaire pour cache. Cela n'a aucun effet sur la " +"commande generate. Élément de configuration : <literal>APT::" +"FTPArchive::DB</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:510 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Mode silencieux ; cette commande produit une sortie destinée à " +"l'enregistrement dans un fichier-journal en omettant les indicateurs de " +"progression. Un plus grand nombre de « q » (2 au plus) produit un " +"plus grand silence. On peut aussi utiliser <option>-q=#</option> pour " +"positionner le niveau de silence, et annuler le fichier de configuration. " +"Élément de configuration : <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:516 +msgid "<option>--delink</option>" +msgstr "<option>--delink</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:518 +msgid "" +"Perform Delinking. If the <literal>External-Links</literal> setting is used " +"then this option actually enables delinking of the files. It defaults to on " +"and can be turned off with <option>--no-delink</option>. Configuration " +"Item: <literal>APT::FTPArchive::DeLinkAct</literal>." +msgstr "" +"Défaire une liaison. Si <literal>External-Links</literal> est activé, cette " +"option permet réellement de délier les fichiers. Par défaut, elle est " +"activée mais elle peut être désactivée avec l'option <option>--no-delink</" +"option>. Élément de configuration : <literal>APT::FTPArchive::" +"DeLinkAct</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:524 +msgid "<option>--contents</option>" +msgstr "<option>--contents</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:526 +msgid "" +"Perform contents generation. When this option is set and package indexes are " +"being generated with a cache DB then the file listing will also be extracted " +"and stored in the DB for later use. When using the generate command this " +"option also allows the creation of any Contents files. The default is on. " +"Configuration Item: <literal>APT::FTPArchive::Contents</literal>." +msgstr "" +"Permettre la création d'un fichier « Contents ». Quand cette option " +"est activée et que les index sont créés sous forme de base de données " +"binaire, la liste des fichiers est aussi extraite et conservée dans la base " +"de données pour un usage futur. Avec la commande generate, cette option " +"permet la création de fichiers « Contents ». Par défaut, elle est " +"activée. Élément de configuration : <literal>APT::FTPArchive::" +"Contents</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:534 +msgid "<option>--source-override</option>" +msgstr "<option>--source-override</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:536 +msgid "" +"Select the source override file to use with the <literal>sources</literal> " +"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" +"literal>." +msgstr "" +"Indique le fichier d'« override » à utiliser avec la commande " +"<literal>sources</literal>. Élément de configuration : <literal>APT::" +"FTPArchive::SourceOverride</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:540 +msgid "<option>--readonly</option>" +msgstr "<option>--readonly</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:542 +msgid "" +"Make the caching databases read only. Configuration Item: <literal>APT::" +"FTPArchive::ReadOnlyDB</literal>." +msgstr "" +"N'autoriser que la lecture pour les bases de données de cache. Élément de " +"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:551 apt.conf.5.xml:818 apt_preferences.5.xml:460 +#: sources.list.5.xml:180 +msgid "Examples" +msgstr "Exemples" + +#. type: Content of: <refentry><refsect1><para><programlisting> +#: apt-ftparchive.1.xml:557 +#, no-wrap +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "" +"<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:553 +msgid "" +"To create a compressed Packages file for a directory containing binary " +"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Création d'un fichier « Packages » compressé pour un répertoire contenant des paquets binaires (.deb): <placeholder type=\"programlisting\" " +"id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:567 +msgid "" +"<command>apt-ftparchive</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " +"nombre 100 en cas d'erreur." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-get.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"Novembre 2008</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-get.8.xml:22 apt-get.8.xml:28 +msgid "apt-get" +msgstr "apt-get" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-get.8.xml:29 +msgid "APT package handling utility -- command-line interface" +msgstr "" +"Utilitaire APT pour la manipulation de paquets -- interface en ligne de " +"commande." + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-get.8.xml:35 +msgid "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </" +"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable> <arg> =<replaceable>pkg_version_number</" +"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +msgstr "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>option_de_configuration</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>fichier_de_configuration</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>nom_version_cible</replaceable> </arg> <arg choice='plain'> " +"<replaceable>expression_numéro_version_cible</replaceable> </arg> <arg " +"choice='plain'> <replaceable>nom_code_version_cible</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>numero_version_paquet</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>nom_version_cible</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>nom_code_version_cible</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>paquet</replaceable> <arg> =<replaceable>numéro_version_paquet</" +"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>paquet</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>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:115 +msgid "" +"<command>apt-get</command> is the command-line tool for handling packages, " +"and may be considered the user's \"back-end\" to other tools using the APT " +"library. Several \"front-end\" interfaces exist, such as &dselect;, " +"&aptitude;, &synaptic;, &gnome-apt; and &wajig;." +msgstr "" +"<command>Apt-get</command> est l'outil en ligne de commande pour manipuler " +"les paquets. Il peut être considéré comme l'outil de base (« backend ») pour les autres outils de la bibliothèque APT. Plusieurs interfaces " +"utilisateur existent, comme dselect, aptitude, synaptic, gnome-apt ou wajig." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:124 apt-key.8.xml:122 +msgid "update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:125 +msgid "" +"<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>. For " +"example, when using a Debian archive, this command retrieves and scans the " +"<filename>Packages.gz</filename> files, so that information about new and " +"updated packages is available. An <literal>update</literal> should always be " +"performed before an <literal>upgrade</literal> or <literal>dist-upgrade</" +"literal>. Please be aware that the overall progress meter will be incorrect " +"as the size of the package files cannot be known in advance." +msgstr "" +"La commande <literal>update</literal> permet de resynchroniser un fichier " +"d'index répertoriant les paquets disponibles et sa source. Ces fichiers sont " +"récupérés aux endroits spécifiés dans <filename>/etc/apt/sources.list</" +"filename>. Ainsi, lorsqu'on utilise une archive Debian, cette commande " +"récupère les fichiers <filename>Packages.gz</filename> et les analyse de " +"manière à rendre disponibles les informations concernant les nouveaux " +"paquets et les paquets mis à jour. On doit toujours exécuter une commande " +"<literal>update</literal> avant les commandes <literal>upgrade</literal> ou " +"<literal>dist-upgrade</literal>. Veuillez noter que l'indicateur de " +"progression d'ensemble peut être imprécis puisque la taille de ces fichiers " +"ne peut être connue à l'avance." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:136 +msgid "upgrade" +msgstr "upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:137 +msgid "" +"<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 new versions available are retrieved and upgraded; under no " +"circumstances are currently installed packages removed, or packages not " +"already installed retrieved and installed. New versions of currently " +"installed packages that cannot be upgraded without changing the install " +"status of another package will be left at their current version. An " +"<literal>update</literal> must be performed first so that <command>apt-get</" +"command> knows that new versions of packages are available." +msgstr "" +"La commande <literal>upgrade</literal> permet d'installer les versions les " +"plus récentes de tous les paquets présents sur le système en utilisant les " +"sources énumérées dans <filename>/etc/apt/sources.list</filename>. Les " +"paquets installés dont il existe de nouvelles versions sont récupérés et mis " +"à niveau. En aucun cas des paquets déjà installés ne sont supprimés ; " +"de même, des paquets qui ne sont pas déjà installés ne sont ni récupérés ni " +"installés. Les paquets dont de nouvelles versions ne peuvent pas être " +"installées sans changer le statut d'installation d'un autre paquet sont " +"laissés dans leur version courante. On doit d'abord exécuter la commande " +"<literal>update</literal> pour que <command>apt-get</command> connaisse " +"l'existence de nouvelles versions des paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:149 +msgid "dselect-upgrade" +msgstr "dselect-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:150 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" +"literal> follows the changes made by &dselect; to the <literal>Status</" +"literal> field of available packages, and performs the actions necessary to " +"realize that state (for instance, the removal of old and the installation of " +"new packages)." +msgstr "" +"<literal>dselect-upgrade</literal> est utilisée conjointement avec " +"&dselect;, l'interface originelle Debian pour la gestion des paquets. " +"La commande <literal>dselect-upgrade</literal> suit les modifications faites " +"par &dselect; dans le champ <literal>Status</literal> des paquets " +"disponibles, et effectue les actions nécessaires à la réalisation de cet " +"état (par exemple, suppression d'anciens paquets, installation de nouveaux " +"paquets)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:159 +msgid "dist-upgrade" +msgstr "dist-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:160 +msgid "" +"<literal>dist-upgrade</literal> in addition to performing the function of " +"<literal>upgrade</literal>, also intelligently handles changing dependencies " +"with new versions of packages; <command>apt-get</command> has a \"smart\" " +"conflict resolution system, and it will attempt to upgrade the most " +"important packages at the expense of less important ones if necessary. So, " +"<literal>dist-upgrade</literal> command may remove some packages. The " +"<filename>/etc/apt/sources.list</filename> file contains a list of locations " +"from which to retrieve desired package files. See also &apt-preferences; " +"for a mechanism for overriding the general settings for individual packages." +msgstr "" +"La commande <literal>dist-upgrade</literal> effectue la fonction " +"<literal>upgrade</literal> en y ajoutant une gestion intelligente des " +"changements de dépendances dans les nouvelles versions des paquets ; " +"<command>apt-get</command> possède un système « intelligent » de " +"résolution des conflits et il essaye, quand c'est nécessaire, de mettre à " +"niveau les paquets les plus importants aux dépens des paquets les moins " +"importants. Le fichier <filename>/etc/apt/sources.list</filename> contient " +"une liste de sources où récupérer les paquets désirés. Voyez aussi &apt-" +"preferences; pour un mécanisme de remplacement des paramètres généraux pour " +"certains paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:172 +msgid "install" +msgstr "install" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:174 +msgid "" +"<literal>install</literal> is followed by one or more packages desired for " +"installation or upgrading. Each package is a package name, not a fully " +"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " +"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " +"packages required by the package(s) specified for installation will also be " +"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " +"file is used to locate the desired packages. If a hyphen is appended to the " +"package name (with no intervening space), the identified package will be " +"removed if it is installed. Similarly a plus sign can be used to designate " +"a package to install. These latter features may be used to override " +"decisions made by apt-get's conflict resolution system." +msgstr "" +"La commande <literal>install</literal> est suivie par un ou plusieurs " +"paquets à installer. Chaque paquet est un nom de paquet ; ce n'est pas " +"un nom complet de fichier (par exemple, dans un système Debian " +"GNU/Linux, on indiquera libc6 et non pas <literal>libc6_1.9.6-2.deb</" +"literal>). Tous les paquets requis par le(s) paquet(s) que l'on veut " +"installer sont aussi récupérés et installés. Le fichier " +"<filename>/etc/apt/sources.list</filename> est utilisé pour retrouver les paquets " +"désirés. Quand un trait d'union est accolé (sans espace intermédiaire) au " +"nom d'un paquet déjà installé, ce paquet est supprimé. De même on peut " +"ajouter un signe « + » pour désigner un paquet à installer. Cette " +"dernière fonctionnalité peut être utilisée pour annuler les décisions prises " +"par le système de résolution des conflits d'apt-get." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:192 +msgid "" +"A specific version of a package can be selected for installation by " +"following the package name with an equals and the version of the package to " +"select. This will cause that version to be located and selected for install. " +"Alternatively a specific distribution can be selected by following the " +"package name with a slash and the version of the distribution or the Archive " +"name (stable, testing, unstable)." +msgstr "" +"On peut choisir d'installer une version particulière d'un paquet en faisant " +"suivre son nom par un signe égal et par la version. Cette version sera " +"recherchée et l'installation sera demandée. On peut aussi choisir une " +"distribution particulière en faisant suivre le nom du paquet par une barre " +"oblique et par le nom de la distribution ou de l'archive (stable, testing, " +"unstable)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:199 +msgid "" +"Both of the version selection mechanisms can downgrade packages and must be " +"used with care." +msgstr "" +"Avec ces possibilités de choisir la version, de vieilles versions d'un " +"paquet peuvent être installées. Cette fonctionnalité est donc à utiliser avec précaution." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:202 +msgid "" +"This is also the target to use if you want to upgrade one or more already-" +"installed packages without upgrading every package you have on your system. " +"Unlike the \"upgrade\" target, which installs the newest version of all " +"currently installed packages, \"install\" will install the newest version of " +"only the package(s) specified. Simply provide the name of the package(s) " +"you wish to upgrade, and if a newer version is available, it (and its " +"dependencies, as described above) will be downloaded and installed." +msgstr "" +"Cette méthode est aussi utile pour mettre à jour un ou plusieurs paquets déjà installés sans mettre à jour les autres paquets du système. À la " +"différence de la commande « upgrade » qui installera le dernière version disponible de tous les paquets installés au moment de son exécution, « " +"install » n'installera la nouvelle version que pour le(s) paquet(s) indiqué(s). Il suffit de fournir le nom du(des) paquet(s) à mettre à jour et si " +"une nouvelle version est disponible, cette version (et ses dépendances, comme décrit plus haut) sera récupérée et installée." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:213 +msgid "" +"Finally, the &apt-preferences; mechanism allows you to create an alternative " +"installation policy for individual packages." +msgstr "" +"Enfin, le mécanisme d'&apt-preferences; permet de créer d'autres règles pour " +"l'installation des paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:217 +msgid "" +"If no package matches the given expression and the expression contains one " +"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " +"it is applied to all package names in the database. Any matches are then " +"installed (or removed). Note that matching is done by substring so 'lo.*' " +"matches 'how-lo' and 'lowest'. If this is undesired, anchor the regular " +"expression with a '^' or '$' character, or create a more specific regular " +"expression." +msgstr "" +"Quand aucun paquet ne correspond à l'expression donnée en paramètre et que " +"cette expression contient l'un des caractères « . », « ? » " +"ou « * », elle est considérée comme une expression rationnelle POSIX " +"et elle est appliquée à tous les paquets de la base de données. Tout paquet " +"correspondant est installé (ou supprimé). Veuillez noter que la comparaison est " +"effectuée par sous-chaîne et « lo.* » correspond aussi bien à « " +"how-lo » qu'à « lowest ». Si ce n'est pas le comportement souhaité, l'expression peut être ancrée avec un caractère « ^ » ou un caractère « $ », " +"une autre possibilité étant d'utiliser une expression plus précise." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:226 +msgid "remove" +msgstr "remove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:227 +msgid "" +"<literal>remove</literal> is identical to <literal>install</literal> except " +"that packages are removed instead of installed. Note the removing a package " +"leaves its configuration files in system. If a plus sign is appended to the " +"package name (with no intervening space), the identified package will be " +"installed instead of removed." +msgstr "" +"La commande <literal>remove</literal> est identique à la commande " +"<literal>install</literal>, les paquets étant alors supprimés et non installés. Veuillez noter que la suppression d'un paquet en laisse les " +"fichiers de configuration sur le système. Quand un signe plus est accolé (sans espace intermédiaire) au nom " +"du paquet, le paquet est installé au lieu d'être supprimé." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:234 +msgid "purge" +msgstr "purge" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:235 +msgid "" +"<literal>purge</literal> is identical to <literal>remove</literal> except " +"that packages are removed and purged (any configuration files are deleted " +"too)." +msgstr "" +"La commande <literal>purge</literal> est identique à <literal>remove</literal> mais les paquets indiqués sont supprimés et purgés (leur fichiers de " +"configuration sont également effacés)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:239 +msgid "source" +msgstr "source" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:240 +msgid "" +"<literal>source</literal> causes <command>apt-get</command> to fetch source " +"packages. APT will examine the available packages to decide which source " +"package to fetch. It will then find and download into the current directory " +"the newest available version of that source package. Source packages are " +"tracked separately from binary packages via <literal>deb-src</literal> type " +"lines in the &sources-list; file. This probably will mean that you will not " +"get the same source as the package you have installed or as you could " +"install. If the --compile options is specified then the package will be " +"compiled to a binary .deb using dpkg-buildpackage, if --download-only is " +"specified then the source package will not be unpacked." +msgstr "" +"Avec la commande <literal>source</literal>, <command>apt-get</command> " +"récupère des paquets sources. APT examine les paquets disponibles pour " +"choisir le paquet source à récupérer. Il trouve ensuite et récupère dans " +"le répertoire courant leur version la plus récente. Les paquets source sont suivis séparément des paquets binaires en utilisant les lignes de type " +"<literal>deb-src</literal> dans le fichier &sources-list;. Cela signifie qu'il n'est pas garanti que vous récupérerez le paquet source " +"correspondant à un paquet binaire présent sur le système. Si l'option --compile est utilisée, e paquet sera compilé en paquet(s) .deb binaire(s) " +"avec dpkg-buildpackage. Si l'option --download-only est utilisée, le paquet source sera seulement récupéré et pas décompressé." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:251 +msgid "" +"A specific source version can be retrieved by postfixing the source name " +"with an equals and then the version to fetch, similar to the mechanism used " +"for the package files. This enables exact matching of the source package " +"name and version, implicitly enabling the <literal>APT::Get::Only-Source</" +"literal> option." +msgstr "" +"De la même façon qu'avec les paquets binaires, on peut récupérer une version " +"particulière d'un paquet source en faisant suivre son nom par un signe égal " +"et par la version. Cela permet une comparaison exacte entre le nom du paquet " +"source et la version ; l'option correspondante est : <literal>APT::Get::Only-Source</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:257 +msgid "" +"Note that source packages are not tracked like binary packages, they exist " +"only in the current directory and are similar to downloading source tar " +"balls." +msgstr "" +"Veuillez noter que les paquets sources ne sont pas suivis comme le sont les paquets " +"binaires. Ils ne sont présents que dans le répertoire courant et sont " +"semblables à des sources téléchargées sous forme d'archives tar." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:262 +msgid "build-dep" +msgstr "build-dep" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:263 +msgid "" +"<literal>build-dep</literal> causes apt-get to install/remove packages in an " +"attempt to satisfy the build dependencies for a source package." +msgstr "" +"Avec la commande <literal>build-dep</literal>, apt-get installe ou supprime " +"des paquets dans le but de satisfaire les dépendances de construction d'un " +"paquet source." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:267 +msgid "check" +msgstr "check" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:268 +msgid "" +"<literal>check</literal> is a diagnostic tool; it updates the package cache " +"and checks for broken dependencies." +msgstr "" +"La commande <literal>check</literal> est un outil de diagnostic ; il " +"met à jour le cache des paquets et cherche des dépendances défectueuses." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:273 +msgid "" +"<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 <filename>&cachedir;/archives/" +"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" +"literal> is run automatically. Those who do not use dselect will likely " +"want to run <literal>apt-get clean</literal> from time to time to free up " +"disk space." +msgstr "" +"La commande <literal>clean</literal> nettoie le référentiel local des " +"paquets récupérés. Elle supprime tout, excepté le fichier de verrou situé dans " +"<filename>&cachedir;/archives/</filename> et <filename>&cachedir;/archives/" +"partial/</filename>. Quand APT est utilisé comme mode de &dselect;, " +"<literal>clean</literal> est exécuté automatiquement. Quand on n'utilise " +"pas dselect, il faut exécuter <literal>apt-get clean</literal> de temps en " +"temps si l'on veut libérer de l'espace disque." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:282 +msgid "autoclean" +msgstr "autoclean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:283 +msgid "" +"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 " +"useless. This allows a cache to be maintained over a long period without it " +"growing out of control. The configuration option <literal>APT::Clean-" +"Installed</literal> will prevent installed packages from being erased if it " +"is set to off." +msgstr "" +"Tout comme <literal>clean</literal>, <literal>autoclean</literal> nettoie le " +"référentiel local des paquets récupérés. La différence est qu'il supprime " +"uniquement les paquets qui ne peuvent plus être téléchargés et qui sont " +"grandement inutiles. On peut ainsi contrôler la taille de ce cache sur une " +"longue période. Tant qu'elle n'est pas activée, l'option de configuration " +"<literal>APT::Clean-Installed</literal> empêche la suppression de paquets " +"installés." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:292 +msgid "autoremove" +msgstr "autoremove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:293 +msgid "" +"<literal>autoremove</literal> is used to remove packages that were " +"automatically installed to satisfy dependencies for some package and that " +"are no more needed." +msgstr "" +"Avec la commande <literal>autoremove</literal>, apt-get supprime " +"les paquets installés dans le but de satisfaire les dépendances d'un paquet donné et qui ne sont plus nécessaires." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:303 apt-get.8.xml:409 +msgid "<option>--no-install-recommends</option>" +msgstr "<option>--no-install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:304 +msgid "" +"Do not consider recommended packages as a dependency for installing. " +"Configuration Item: <literal>APT::Install-Recommends</literal>." +msgstr "" +"Ne pas considérer les paquets recommandés comme des dépendances à installer. Élément de configuration : <literal>APT::Install-Recommends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:308 +msgid "<option>--download-only</option>" +msgstr "<option>--download-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:309 +msgid "" +"Download only; package files are only retrieved, not unpacked or installed. " +"Configuration Item: <literal>APT::Get::Download-Only</literal>." +msgstr "" +"Récupération seule ; les paquets sont récupérés mais ne sont ni " +"dépaquetés ni installés. Élément de configuration : <literal>APT::Get::" +"Download-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:313 +msgid "<option>--fix-broken</option>" +msgstr "<option>--fix-broken</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:314 +msgid "" +"Fix; attempt to correct a system with broken dependencies in place. This " +"option, when used with install/remove, can omit any packages to permit APT " +"to deduce a likely solution. Any Package that are specified must completely " +"correct the problem. The option is sometimes necessary when running APT for " +"the first time; APT itself does not allow broken package dependencies to " +"exist on a system. It is possible that a system's dependency structure can " +"be so corrupt as to require manual intervention (which usually means using " +"&dselect; or <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." +msgstr "" +"Correction ; essaye de réparer un système dont les dépendances sont " +"défectueuses. Cette option, utilisée avec install ou remove, peut omettre " +"tout paquet de façon à permettre à APT de déduire une solution viable. " +"Chaque paquet spécifié doit complètement corriger le problème. Cette option " +"est quelquefois nécessaire lorsque l'on exécute APT pour la première " +"fois ; APT lui-même interdit les dépendances défectueuses dans un " +"système. Il est possible que la structure de dépendances d'un système soit " +"tellement corrompue qu'elle requiert une intervention manuelle (ce qui veut " +"dire la plupart du temps utiliser &dselect; ou <command>dpkg --remove</" +"command> pour éliminer les paquets en cause). L'utilisation de cette option " +"conjointement avec <option>-m</option> peut produire une erreur dans " +"certaines situations. Élément de configuration : <literal>APT::Get::" +"Fix-Broken</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:327 +msgid "<option>--ignore-missing</option>" +msgstr "<option>--ignore-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:328 +msgid "<option>--fix-missing</option>" +msgstr "<option>--fix-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:329 +msgid "" +"Ignore missing packages; If packages cannot be retrieved or fail the " +"integrity check after retrieval (corrupted package files), hold back those " +"packages and handle the result. Use of this option together with <option>-f</" +"option> may produce an error in some situations. If a package is selected " +"for installation (particularly if it is mentioned on the command line) and " +"it could not be downloaded then it will be silently held back. " +"Configuration Item: <literal>APT::Get::Fix-Missing</literal>." +msgstr "" +"Ignorer les paquets manquants ; si des paquets ne peuvent être " +"récupérés, ou, après récupération, ne satisfont pas au contrôle d'intégrité, " +"cette commande met ces paquets de côté et gère le résultat. Utiliser cette " +"option conjointement avec <option>-f</option> peut produire une erreur dans " +"certaines situations. Quand un paquet, sélectionné pour une installation " +"(particulièrement si c'est mentionné en ligne de commande), ne peut être " +"récupéré, il est mis silencieusement de côté. Élément de " +"configuration : <literal>APT::Get::Fix-Missing</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:339 +msgid "<option>--no-download</option>" +msgstr "<option>--no-download</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:340 +msgid "" +"Disables downloading of packages. This is best used with <option>--ignore-" +"missing</option> to force APT to use only the .debs it has already " +"downloaded. Configuration Item: <literal>APT::Get::Download</literal>." +msgstr "" +"Pas de récupération. Le mieux est d'utiliser cette option avec <option>--" +"ignore-missing</option> pour forcer APT à n'utiliser que les .deb qu'il a " +"déjà récupérés. Élément de configuration : <literal>APT::Get::" +"Download</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:347 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Note that quiet level 2 implies <option>-y</option>, you should never " +"use -qq without a no-action modifier such as -d, --print-uris or -s as APT " +"may decided to do something you did not expect. Configuration Item: " +"<literal>quiet</literal>." +msgstr "" +"Mode silencieux ; cette commande produit une sortie destinée à " +"l'enregistrement dans un fichier-journal en omettant les indicateurs de " +"progression. Un plus grand nombre de « q » (2 au plus) produit un " +"plus grand silence. On peut aussi utiliser <option>-q=#</option> pour " +"positionner le niveau de silence, et annuler le fichier de configuration. " +"Notez qu'un niveau de silence égal à 2 implique <option>-y</option> et vous " +"ne devez jamais utiliser <option>-qq</option> sans l'accompagner d'un " +"modificateur tel que <option>-d</option>, <option>--print-uris</option> ou " +"<option>-s</option> : APT pourrait alors exécuter des actions " +"inattendues. Élément de configuration : <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:357 +msgid "<option>--simulate</option>" +msgstr "<option>--simulate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:359 +msgid "<option>--dry-run</option>" +msgstr "<option>--dry-run</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:362 +msgid "" +"No action; perform a simulation of events that would occur but do not " +"actually change the system. Configuration Item: <literal>APT::Get::" +"Simulate</literal>." +msgstr "" +"Pas d'action ; simule les événements qui devraient se produire sans effectuer de changement réel sur le système. Élément de " +"configuration : <literal>APT::Get::Simulate</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:366 +msgid "" +"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" +"literal>) automatical. Also a notice will be displayed indicating that this " +"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-" +"Note</literal> is set (Default: true) Neigther NoLocking nor the notice " +"will be triggered if run as root (root should know what he is doing without " +"further warnings by <literal>apt-get</literal>)." +msgstr "" +"Lorsque la simulation est effectuée par un utilisateur sans privilèges, le verrouillage (<literal>Debug::NoLocking</" +"literal>) sera désactivé automatiquement. Une mention explicite qu'il s'agit d'une simple simulation sera affichée si l'option <literal>" +"APT::Get::Show-User-Simulation-" +"Note</literal> est activée (elle est active par défaut). Ni la désactivation du verrou ni l'affichage de la mention de simulation ne seront " +"utilisées si la commande est lancée par l'utilisateur root (pour qui il n'est pas jugé utile qu'<literal>apt-get</literal> envoie de telles " +"notifications)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:372 +#, fuzzy +msgid "" +"Simulate prints out a series of lines each one representing a dpkg " +"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " +"indicate broken packages with and empty set of square brackets meaning " +"breaks that are of no consequence (rare)." +msgstr "" +"La simulation affiche une série de lignes représentant chacune une opération " +"de dpkg, Configure (Conf),Remove (Remv),Unpack (Inst). Les crochets " +"encadrent des paquets endommagés et des crochets n'encadrant rien indiquent " +"que les dommages n'ont aucune conséquence (rare)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +#, fuzzy +msgid "<option>-y</option>" +msgstr "<option>-y</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +#, fuzzy +msgid "<option>--yes</option>" +msgstr "<option>--yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:380 +#, fuzzy +msgid "<option>--assume-yes</option>" +msgstr "<option>--assume-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:381 +#, fuzzy +msgid "" +"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " +"non-interactively. If an undesirable situation, such as changing a held " +"package, trying to install a unauthenticated package or removing an " +"essential package occurs then <literal>apt-get</literal> will abort. " +"Configuration Item: <literal>APT::Get::Assume-Yes</literal>." +msgstr "" +"Répond automatiquement oui aux questions ; présume « oui » " +"comme réponse à toutes les questions et s'exécute de manière non " +"interactive. Dans le cas d'une situation indésirable, comme le changement " +"d'un paquet gelé, l'installation d'un paquet non authentifié ou la " +"suppression d'un paquet essentiel, <literal>apt-get</literal> s'interrompt. " +"Élément de configuration : <literal>APT::Get::Assume-Yes</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:388 +#, fuzzy +msgid "<option>-u</option>" +msgstr "<option>-u</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:388 +#, fuzzy +msgid "<option>--show-upgraded</option>" +msgstr "<option>--show-upgraded</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:389 +#, fuzzy +msgid "" +"Show upgraded packages; Print out a list of all packages that are to be " +"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." +msgstr "" +"Afficher les paquets mis à niveau ; affiche une liste de tous les " +"paquets à mettre à niveau. Élément de configuration : <literal>APT::" +"Get::Show-Upgraded</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:394 +#, fuzzy +msgid "<option>-V</option>" +msgstr "<option>-V</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:394 +#, fuzzy +msgid "<option>--verbose-versions</option>" +msgstr "<option>--verbose-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:395 +#, fuzzy +msgid "" +"Show full versions for upgraded and installed packages. Configuration Item: " +"<literal>APT::Get::Show-Versions</literal>." +msgstr "" +"Afficher les versions complètes des paquets installés ou mis à niveau. " +"Élément de configuration : <literal>APT::Get::Show-Versions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +#, fuzzy +msgid "<option>-b</option>" +msgstr "<option>-b</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +#, fuzzy +msgid "<option>--compile</option>" +msgstr "<option>--compile</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:400 +#, fuzzy +msgid "<option>--build</option>" +msgstr "<option>--build</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:401 +#, fuzzy +msgid "" +"Compile source packages after downloading them. Configuration Item: " +"<literal>APT::Get::Compile</literal>." +msgstr "" +"Cette commande compile un paquet source après l'avoir récupéré. Élément de " +"configuration : <literal>APT::Get::Compile</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:405 +#, fuzzy +msgid "<option>--install-recommends</option>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:406 +msgid "Also install recommended packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:410 +msgid "Do not install recommended packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:413 +#, fuzzy +msgid "<option>--ignore-hold</option>" +msgstr "<option>--ignore-hold</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:414 +#, fuzzy +msgid "" +"Ignore package Holds; This causes <command>apt-get</command> to ignore a " +"hold placed on a package. This may be useful in conjunction with " +"<literal>dist-upgrade</literal> to override a large number of undesired " +"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." +msgstr "" +"Cette commande ignore la marque « Hold » d'un paquet ; par ce " +"biais, <command>apt-get</command> ignore un « hold » placé sur un " +"paquet. cela peut être utile avec <literal>dist-upgrade</literal> pour " +"annuler un grand nombre de « hold » indésirables. Élément de " +"configuration : <literal>APT::Ignore-Hold</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:420 +#, fuzzy +msgid "<option>--no-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:421 +#, fuzzy +msgid "" +"Do not upgrade packages; When used in conjunction with <literal>install</" +"literal>, <literal>no-upgrade</literal> will prevent packages on the command " +"line from being upgraded if they are already installed. Configuration Item: " +"<literal>APT::Get::Upgrade</literal>." +msgstr "" +"Aucune mise à niveau ; quand elle est utilisée avec <literal>install</" +"literal>, cette commande empêche les paquets listés sur la ligne de commande " +"d'être mis à niveau. Élément de configuration : <literal>APT::Get::" +"Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:427 +#, fuzzy +msgid "<option>--force-yes</option>" +msgstr "<option>--force-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:428 +#, fuzzy +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 " +"not be used except in very special situations. Using <literal>force-yes</" +"literal> can potentially destroy your system! Configuration Item: " +"<literal>APT::Get::force-yes</literal>." +msgstr "" +"Forcer l'acceptation ; cette option est dangereuse parce qu'elle laisse " +"APT continuer sans poser de questions quand il réalise quelque chose de " +"potentiellement dommageable. Cette option ne doit être utilisée que dans des " +"circonstances très spéciales. Utiliser <literal>force-yes</literal> peut " +"détruire le système ! Élément de configuration : <literal>APT::" +"Get::force-yes</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:435 +#, fuzzy +msgid "<option>--print-uris</option>" +msgstr "<option>--print-uris</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:436 +#, fuzzy +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 " +"hash. Note that the file name to write to will not always match the file " +"name on the remote site! This also works with the <literal>source</literal> " +"and <literal>update</literal> commands. When used with the <literal>update</" +"literal> command the MD5 and size are not included, and it is up to the user " +"to decompress any compressed files. Configuration Item: <literal>APT::Get::" +"Print-URIs</literal>." +msgstr "" +"Au lieu d'aller chercher les paquets à installer, leurs URI sont affichées. " +"Chaque URI a un chemin, un nom de fichier destination, une taille et une clé " +"md5 attendue. Notez que le nom de fichier à afficher ne correspond pas " +"toujours au nom de fichier sur le site distant ! Cette option " +"fonctionne aussi avec la commande <literal>source</literal> et avec la " +"commande <literal>update</literal>. Avec la commande <literal>update</" +"literal>, la somme MD5 et la taille ne sont pas données et c'est à " +"l'utilisateur de décompresser les fichiers compressés. Élément de " +"configuration : <literal>APT::Get::Print-URIs</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:446 +#, fuzzy +msgid "<option>--purge</option>" +msgstr "<option>--purge</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:447 +#, fuzzy +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. " +"<option>remove --purge</option> is equivalent for <option>purge</option> " +"command. Configuration Item: <literal>APT::Get::Purge</literal>." +msgstr "" +"Utiliser purge à la place de remove pour supprimer tout ce qui peut être " +"supprimé. Un astérisque (*) sera affiché près des paquets qui vont être " +"purgés. Élément de configuration : <literal>APT::Get::Purge</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +#, fuzzy +msgid "<option>--reinstall</option>" +msgstr "<option>--reinstall</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +#, fuzzy +msgid "" +"Re-Install packages that are already installed and at the newest version. " +"Configuration Item: <literal>APT::Get::ReInstall</literal>." +msgstr "" +"Réinstaller les paquets déjà installés avec leur version la plus récente. " +"Élément de configuration : <literal>APT::Get::ReInstall</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:459 +#, fuzzy +msgid "<option>--list-cleanup</option>" +msgstr "<option>--list-cleanup</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:460 +#, fuzzy +msgid "" +"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " +"it off. When on <command>apt-get</command> will automatically manage the " +"contents of <filename>&statedir;/lists</filename> to ensure that obsolete " +"files are erased. The only reason to turn it off is if you frequently " +"change your source list. Configuration Item: <literal>APT::Get::List-" +"Cleanup</literal>." +msgstr "" +"Cette option est activée par défaut ; utilisez <literal>--no-list-" +"cleanup</literal> pour la désactiver. Quand elle est activée, <command>apt-" +"get</command> gère automatiquement le contenu de <filename>&statedir;/lists</" +"filename> afin d'assurer que les fichiers obsolètes soient effacés. La seule " +"raison de la désactiver est une modification fréquente de votre liste de " +"sources. Élément de configuration : <literal>APT::Get::List-Cleanup</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:469 +#, fuzzy +msgid "<option>--target-release</option>" +msgstr "<option>--target-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:470 +#, fuzzy +msgid "<option>--default-release</option>" +msgstr "<option>--default-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:471 +#, fuzzy +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 " +"overrides the general settings in <filename>/etc/apt/preferences</" +"filename>. Specifically pinned packages are not affected by the value of " +"this option. In short, this option lets you have simple control over which " +"distribution packages will be retrieved from. Some common examples might be " +"<option>-t '2.1*'</option>, <option>-t unstable</option> or <option>-t sid</" +"option>. Configuration Item: <literal>APT::Default-Release</literal>; see " +"also the &apt-preferences; manual page." +msgstr "" +"Cette option contrôle l'entrée par défaut pour les questions de " +"distribution ; une étiquette (pin) par défaut dont la priorité vaut 990 " +"est créé en utilisant la chaîne spécifiée. Le fichier des préférences peut " +"annuler cette décision. En clair, cette option permet de contrôler " +"simplement dans quelle distribution seront récupérés les paquets. Par " +"exemple : <option>-t '2.1*'</option> ou <option>-t unstable</option>. " +"Élément de configuration : <literal>APT::Default-Release</literal>. " +"Voyez aussi la page de manuel d'&apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:484 +#, fuzzy +msgid "<option>--trivial-only</option>" +msgstr "<option>--trivial-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:486 +#, fuzzy +msgid "" +"Only perform operations that are 'trivial'. Logically this can be considered " +"related to <option>--assume-yes</option>, where <option>--assume-yes</" +"option> will answer yes to any prompt, <option>--trivial-only</option> will " +"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." +msgstr "" +"Ne réalise que les opérations « triviales ». Logiquement ceci peut " +"être considéré comme relatif à <option>--assume-yes</option>. Alors que " +"<option>--assume-yes</option> répond oui à n'importe quelle question, " +"<option>--trivial-only</option> répond non. Élément de configuration : " +"<literal>APT::Get::Trivial-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:492 +#, fuzzy +msgid "<option>--no-remove</option>" +msgstr "<option>--no-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:493 +#, fuzzy +msgid "" +"If any packages are to be removed apt-get immediately aborts without " +"prompting. Configuration Item: <literal>APT::Get::Remove</literal>." +msgstr "" +"Quand des paquets doivent être supprimés, apt-get s'arrête immédiatement " +"sans poser de questions. Élément de configuration : <literal>APT::Get::" +"Remove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:498 +#, fuzzy +msgid "<option>--auto-remove</option>" +msgstr "<option>--no-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:499 +#, fuzzy +msgid "" +"If the command is either <literal>install</literal> or <literal>remove</" +"literal>, then this option acts like running <literal>autoremove</literal> " +"command, removing the unused dependency packages. Configuration Item: " +"<literal>APT::Get::AutomaticRemove</literal>." +msgstr "" +"Aucune mise à niveau ; quand elle est utilisée avec <literal>install</" +"literal>, cette commande empêche les paquets listés sur la ligne de commande " +"d'être mis à niveau. Élément de configuration : <literal>APT::Get::" +"Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:505 +#, fuzzy +msgid "<option>--only-source</option>" +msgstr "<option>--only-source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:506 +#, fuzzy +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 " +"mapped through the binary table. This means that if this option is " +"specified, these commands will only accept source package names as " +"arguments, rather than accepting binary package names and looking up the " +"corresponding source package. Configuration Item: <literal>APT::Get::Only-" +"Source</literal>." +msgstr "" +"Cette option n'a de sens qu'avec les commandes <literal>source</literal> et " +"<literal>build-dep</literal>. Elle indique que les noms de sources donnés ne " +"doivent pas être repérés à travers le tableau des binaires. Cela signifie " +"que si cette option est choisie, la commande <literal>source</literal> " +"acceptera seulement des noms de paquets source comme argument ; elle " +"n'acceptera pas de les rechercher à partir des noms de paquets binaires " +"correspondants. Élément de configuration : <literal>APT::Get::Only-" +"Source</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +#, fuzzy +msgid "<option>--diff-only</option>" +msgstr "<option>--readonly</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +#, fuzzy +msgid "<option>--dsc-only</option>" +msgstr "<option>--names-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:516 +#, fuzzy +msgid "<option>--tar-only</option>" +msgstr "<option>--trivial-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:517 +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</" +"literal>, and <literal>APT::Get::Tar-Only</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:522 +#, fuzzy +msgid "<option>--arch-only</option>" +msgstr "<option>--recon</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:523 +#, fuzzy +msgid "" +"Only process architecture-dependent build-dependencies. Configuration Item: " +"<literal>APT::Get::Arch-Only</literal>." +msgstr "" +"N'effectue une recherche que sur les noms de paquets et pas sur les " +"descriptions longues. Élément de configuration : <literal>APT::Cache::" +"NamesOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:527 +#, fuzzy +msgid "<option>--allow-unauthenticated</option>" +msgstr "<option>--allow-unauthenticated</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:528 +#, fuzzy +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::" +"AllowUnauthenticated</literal>." +msgstr "" +"Ignorer le fait que les paquets ne peuvent pas être authentifiés ; pas " +"d'interrogation de l'utilisateur. C'est très utile pour certains outils " +"comme pbuilder Élément de configuration : <literal>APT::Get::" +"AllowUnauthenticated</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:546 apt.conf.5.xml:825 +#, fuzzy +msgid "<filename>/etc/apt/apt.conf</filename>" +msgstr "<filename>/etc/apt/apt.conf</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:547 +#, fuzzy +msgid "" +"APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" +"literal>." +msgstr "" +"Fichier de configuration d'APT. Élément de configuration : " +"<literal>Dir::Etc::Main</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:551 +#, fuzzy +msgid "<filename>/etc/apt/apt.conf.d/</filename>" +msgstr "<filename>/etc/apt/apt.conf.d/</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:552 +#, fuzzy +msgid "" +"APT configuration file fragments. Configuration Item: <literal>Dir::Etc::" +"Parts</literal>." +msgstr "" +"Éléments du fichier de configuration d'APT. Élément de configuration : " +"<literal>Dir::Etc::Parts</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:556 +#, fuzzy +msgid "<filename>/etc/apt/preferences</filename>" +msgstr "<filename>/etc/apt/preferences</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:557 +#, fuzzy +msgid "" +"Version preferences file. This is where you would specify \"pinning\", i.e. " +"a preference to get certain packages from a separate source or from a " +"different version of a distribution. Configuration Item: <literal>Dir::Etc::" +"Preferences</literal>." +msgstr "" +"Fichier des préférences. C'est dans ce fichier qu'on peut faire de " +"l'étiquetage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une " +"source distincte ou d'une distribution différente. Élément de " +"configuration : <literal>Dir::Etc::Preferences</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:565 +#, fuzzy +msgid "<filename>&cachedir;/archives/</filename>" +msgstr "<filename>&cachedir;/archives/</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:566 +#, fuzzy +msgid "" +"Storage area for retrieved package files. Configuration Item: <literal>Dir::" +"Cache::Archives</literal>." +msgstr "" +"Zone de stockage pour les paquets récupérés. Élément de " +"configuration : <literal>Dir::Cache::Archives</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:570 +#, fuzzy +msgid "<filename>&cachedir;/archives/partial/</filename>" +msgstr "<filename>&cachedir;/archives/partial/</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:571 +#, fuzzy +msgid "" +"Storage area for package files in transit. Configuration Item: " +"<literal>Dir::Cache::Archives</literal> (implicit partial)." +msgstr "" +"Zone de stockage pour les paquets en transit. Élément de " +"configuration : <literal>Dir::Cache::Archives</literal> (implicitement, " +"partial)." + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:589 +#, fuzzy +msgid "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +"preferences;, the APT Howto." +msgstr "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, le guide « APT users guide » dans &docdir;, &apt-" +"preferences;, le guide APT." + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:595 +#, fuzzy +msgid "" +"<command>apt-get</command> returns zero on normal operation, decimal 100 on " +"error." +msgstr "" +"<command>apt-get</command> renvoie zéro après une opération normale, le " +"décimal 100 en cas d'erreur." + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:598 +#, fuzzy +msgid "ORIGINAL AUTHORS" +msgstr "ORIGINAL AUTHORS" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:599 +#, fuzzy +msgid "&apt-author.jgunthorpe;" +msgstr "&apt-author.jgunthorpe;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:602 +#, fuzzy +msgid "CURRENT AUTHORS" +msgstr "CURRENT AUTHORS" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:604 +#, fuzzy +msgid "&apt-author.team;" +msgstr "&apt-author.team;" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-key.8.xml:14 apt-key.8.xml:20 +#, fuzzy +msgid "apt-key" +msgstr "apt-key" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-key.8.xml:21 +#, fuzzy +msgid "APT key management utility" +msgstr "Utilitaire de gestion des clés" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-key.8.xml:27 +#, fuzzy +msgid "" +"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" +msgstr "" +"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:35 +#, fuzzy +msgid "" +"<command>apt-key</command> is used to manage the list of keys used by apt to " +"authenticate packages. Packages which have been authenticated using these " +"keys will be considered trusted." +msgstr "" +"<command>apt-key</command> gère les clés dont se sert apt pour authentifier " +"les paquets. Les paquets authentifiés par ces clés seront réputés fiables." + +#. type: Content of: <refentry><refsect1><title> +#: apt-key.8.xml:41 +#, fuzzy +msgid "Commands" +msgstr "Commandes" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:43 +#, fuzzy +msgid "add <replaceable>filename</replaceable>" +msgstr "add <replaceable>fichier</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:47 +#, 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>." +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 " +"<replaceable>fichier</replaceable> est <literal>-</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:55 +#, fuzzy +msgid "del <replaceable>keyid</replaceable>" +msgstr "del <replaceable>keyid</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:59 +#, fuzzy +msgid "Remove a key from the list of trusted keys." +msgstr "Supprimer une clé de la liste des clés fiables." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:66 +#, fuzzy +msgid "export <replaceable>keyid</replaceable>" +msgstr "del <replaceable>keyid</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:70 +#, fuzzy +msgid "Output the key <replaceable>keyid</replaceable> to standard output." +msgstr "del <replaceable>keyid</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:77 +msgid "exportall" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:81 +msgid "Output all trusted keys to standard output." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:88 +#, fuzzy +msgid "list" +msgstr "list" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:92 +#, fuzzy +msgid "List trusted keys." +msgstr "Afficher la liste des clés fiables." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:99 +#, fuzzy +msgid "finger" +msgstr "file" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:103 +#, fuzzy +msgid "List fingerprints of trusted keys." +msgstr "Afficher la liste des clés fiables." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:110 +#, fuzzy +msgid "adv" +msgstr "add" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:114 +msgid "" +"Pass advanced options to gpg. With adv --recv-key you can download the " +"public key." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:126 +#, fuzzy +msgid "" +"Update the local keyring with the keyring of Debian archive keys and removes " +"from the keyring the archive keys which are no longer valid." +msgstr "" +"Mettre à jour le trousseau de clés local avec le trousseau de clés de " +"l'archive Debian et supprimer les clés qui sont périmées." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:139 +#, fuzzy +msgid "<filename>/etc/apt/trusted.gpg</filename>" +msgstr "<filename>/etc/apt/trusted.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:140 +#, fuzzy +msgid "Keyring of local trusted keys, new keys will be added here." +msgstr "Trousseau de clés locales fiables, les nouvelles clés sont ajoutées ici." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:143 +#, fuzzy +msgid "<filename>/etc/apt/trustdb.gpg</filename>" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:144 +#, fuzzy +msgid "Local trust database of archive keys." +msgstr "Base de données locale fiable des clés de l'archive." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:147 +#, fuzzy +msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:148 +#, fuzzy +msgid "Keyring of Debian archive trusted keys." +msgstr "Trousseau des clés fiables de l'archive Debian." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:151 +#, fuzzy +msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:152 +#, fuzzy +msgid "Keyring of Debian archive removed trusted keys." +msgstr "Trousseau des clés fiables supprimées de l'archive Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:163 +#, fuzzy +msgid "&apt-get;, &apt-secure;" +msgstr "&apt-get;, &apt-secure;" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-mark.8.xml:13 +#, fuzzy +msgid "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " +"November 2007</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " +"Février 2004</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-mark.8.xml:22 apt-mark.8.xml:28 +#, fuzzy +msgid "apt-mark" +msgstr "apt-key" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-mark.8.xml:29 +msgid "mark/unmark a package as being automatically-installed" +msgstr "" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-mark.8.xml:35 +#, fuzzy +msgid "" +"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req" +"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " +"rep=\"repeat\"><replaceable>package</replaceable></arg>" +msgstr "" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>option de configuration</replaceable></option></" +"arg> <arg><option>-c=<replaceable>fichier</replaceable></option></arg> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>fichier</replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:44 +msgid "" +"<command>apt-mark</command> will change whether a package has been marked as " +"being automatically installed." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:48 +msgid "" +"When you request that a package is installed, and as a result other packages " +"are installed to satisfy its dependencies, the dependencies are marked as " +"being automatically installed. Once these automatically installed packages " +"are no longer depended on by any manually installed packages, they will be " +"removed." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:55 +msgid "markauto" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:56 +msgid "" +"<literal>markauto</literal> is used to mark a package as being automatically " +"installed, which will cause the package to be removed when no more manually " +"installed packages depend on this package." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:63 +msgid "unmarkauto" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:64 +msgid "" +"<literal>unmarkauto</literal> is used to mark a package as being manually " +"installed, which will prevent the package from being automatically removed " +"if no other packages depend on it." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:76 +#, fuzzy +msgid "<option>-f=<filename>FILENAME</filename></option>" +msgstr "<option>--all-names</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:76 +#, fuzzy +msgid "<option>--file=<filename>FILENAME</filename></option>" +msgstr "<option>--default-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:79 +msgid "" +"Read/Write package stats from <filename>FILENAME</filename> instead of the " +"default location, which is <filename>extended_status</filename> in the " +"directory defined by the Configuration Item: <literal>Dir::State</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:85 +#, fuzzy +msgid "<option>-h</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:86 +#, fuzzy +msgid "<option>--help</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:87 +msgid "Show a short usage summary." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:93 +#, fuzzy +msgid "<option>-v</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:94 +#, fuzzy +msgid "<option>--version</option>" +msgstr "<option>--all-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:95 +msgid "Show the program version." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:109 +#, fuzzy +msgid "" +"<command>apt-mark</command> returns zero on normal operation, non-zero on " +"error." +msgstr "" +"<command>apt-cache</command> retourne zéro après un déroulement normal, et " +"le nombre décimal 100 en cas d'erreur." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-secure.8.xml:14 apt-secure.8.xml:35 +#, fuzzy +msgid "apt-secure" +msgstr "apt-secure" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-secure.8.xml:36 +#, fuzzy +msgid "Archive authentication support for APT" +msgstr "Certification d'archive avec APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:41 +#, fuzzy +msgid "" +"Starting with version 0.6, <command>apt</command> contains code that does " +"signature checking of the Release file for all archives. This ensures that " +"packages in the archive can't be modified by people who have no access to " +"the Release file signing key." +msgstr "" +"Depuis sa version 0.6, <command>apt</command> sait vérifier la signature du " +"fichier Release de chaque archive. On s'assure ainsi que les paquets de " +"cette archive ne peuvent pas être modifiés par quelqu'un qui ne possède pas " +"la clé de la signature du fichier Release." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:49 +#, fuzzy +msgid "" +"If a package comes from a archive without a signature or with a signature " +"that apt does not have a key for that package is considered untrusted and " +"installing it will result in a big warning. <command>apt-get</command> will " +"currently only warn for unsigned archives, future releases might force all " +"sources to be verified before downloading packages from them." +msgstr "" +"Quand un paquet provient d'une archive sans signature ou d'une archive avec " +"une signature dont apt ne possède pas la clé, ce paquet n'est pas considéré " +"comme fiable et son installation provoquera un avertissement. Pour " +"l'instant, <command>apt-get</command> ne signale que les archives sans " +"signature ; les prochaines versions pourraient rendre obligatoire la " +"vérification des sources avant tout téléchargement de paquet." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:58 +#, fuzzy +msgid "" +"The package frontends &apt-get;, &aptitude; and &synaptic; support this new " +"authentication feature." +msgstr "" +"Les paquets &apt-get;, &aptitude; et &synaptic; possèdent cette nouvelle " +"fonction de certification." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:63 +#, fuzzy +msgid "Trusted archives" +msgstr "Archives fiables" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:66 +#, fuzzy +msgid "" +"The chain of trust from an apt archive to the end user is made up of " +"different steps. <command>apt-secure</command> is the last step in this " +"chain, trusting an archive does not mean that the packages that you trust it " +"do not contain malicious code but means that you trust the archive " +"maintainer. Its the archive maintainer responsibility to ensure that the " +"archive integrity is correct." +msgstr "" +"D'une archive apt jusqu'à l'utilisateur, la confiance se construit en " +"plusieurs étapes. <command>Apt-secure</command> est la dernière étape. Faire " +"confiance à une archive ne signifie pas que les paquets qu'elle contient " +"sont exempts de code malveillant, mais signifie que vous faites confiance au " +"responsable de l'archive. C'est ensuite au responsable de l'archive de faire " +"en sorte que l'archive soit fiable." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:74 +#, fuzzy +msgid "" +"apt-secure does not review signatures at a package level. If you require " +"tools to do this you should look at <command>debsig-verify</command> and " +"<command>debsign</command> (provided in the debsig-verify and devscripts " +"packages respectively)." +msgstr "" +"<command>Apt-secure</command> n'examine pas la signature d'un paquet. " +"Certains programmes peuvent le faire comme <command>debsig-verify</command> " +"ou <command>debsign</command>, qu'on peut trouver dans les paquets debsig-" +"verify et devscripts." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:81 +#, fuzzy +msgid "" +"The chain of trust in Debian starts when a maintainer uploads a new package " +"or a new version of a package to the Debian archive. This upload in order to " +"become effective needs to be signed by a key of a maintainer within the " +"Debian maintainer's keyring (available in the debian-keyring package). " +"Maintainer's keys are signed by other maintainers following pre-established " +"procedures to ensure the identity of the key holder." +msgstr "" +"La fiabilisation dans Debian commence quand un responsable de paquet envoie " +"un nouveau paquet ou une nouvelle version d'un paquet dans l'archive. Cet " +"envoi, pour être effectif, doit être signé avec la clé d'un responsable qui " +"se trouve dans le trousseau des responsables Debian (disponible dans le " +"paquet debian-keyring). Les clés des responsables de paquet sont signées par " +"d'autres responsables, suivant des procédures préétablies pour s'assurer de " +"l'identité des propriétaires de la clé." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:91 +#, fuzzy +msgid "" +"Once the uploaded package is verified and included in the archive, the " +"maintainer signature is stripped off, an MD5 sum of the package is computed " +"and put in the Packages file. The MD5 sum of all of the packages files are " +"then computed and put into the Release file. The Release file is then signed " +"by the archive key (which is created once a year and distributed through the " +"FTP server. This key is also on the Debian keyring." +msgstr "" +"Une fois le paquet vérifié et archivé, la signature du responsable est " +"enlevée, une somme MD5 du paquet est calculée et mise dans le fichier " +"Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise " +"dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette " +"clé qui est créée chaque année et distribuée par le serveur FTP se trouve " +"aussi dans le trousseau Debian." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:101 +#, fuzzy +msgid "" +"Any end user can check the signature of the Release file, extract the MD5 " +"sum of a package from it and compare it with the MD5 sum of the package he " +"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian " +"package was checked. Now both the MD5 sum and the signature of the Release " +"file are checked." +msgstr "" +"Un utilisateur peut consulter la signature du fichier Release, extraire la " +"somme MD5 d'un paquet et la comparer avec la somme du paquet qu'il a " +"téléchargé. Avant la version 0.6, seule la somme du paquet téléchargé était " +"vérifiée. Maintenant on peut vérifier aussi la signature du fichier Release." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:108 +#, fuzzy +msgid "" +"Notice that this is distinct from checking signatures on a per package " +"basis. It is designed to prevent two possible attacks:" +msgstr "" +"Cette façon de faire est différente d'une vérification de la signature d'un " +"paquet. Elle vise à empêcher deux types d'attaque possibles :" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:113 +#, fuzzy +msgid "" +"<literal>Network \"man in the middle\" attacks</literal>. Without signature " +"checking, a malicious agent can introduce himself in the package download " +"process and provide malicious software either by controlling a network " +"element (router, switch, etc.) or by redirecting traffic to a rogue server " +"(through arp or DNS spoofing attacks)." +msgstr "" +"L'attaque de type <quote>homme au milieu</quote>. Sans vérification de " +"signature, quelqu'un de malveillant peut s'introduire au milieu du processus " +"de téléchargement et insérer du code soit en contrôlant un élément du " +"réseau, routeur, commutateur, etc. soit en détournant le trafic vers un " +"serveur fourbe (par usurpation d'adresses)." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:121 +#, fuzzy +msgid "" +"<literal>Mirror network compromise</literal>. Without signature checking, a " +"malicious agent can compromise a mirror host and modify the files in it to " +"propagate malicious software to all users downloading packages from that " +"host." +msgstr "" +"L'attaque par compromission d'un miroir sur le réseau. Sans vérification de " +"signature, quelqu'un de malveillant peut compromettre un miroir et modifier " +"les fichiers. Ainsi tous ceux qui téléchargent les paquets de ce miroir " +"propagent du code malveillant." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:128 +#, fuzzy +msgid "" +"However, it does not defend against a compromise of the Debian master server " +"itself (which signs the packages) or against a compromise of the key used to " +"sign the Release files. In any case, this mechanism can complement a per-" +"package signature." +msgstr "" +"Cependant cette méthode ne garantit pas contre une compromission du serveur " +"Debian lui-même (qui signe les paquets) ni contre la compromission de la clé " +"qui sert à signer les fichiers Release. Mais elle peut compléter la " +"signature des paquets." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:134 +#, fuzzy +msgid "User configuration" +msgstr "Configuration" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:136 +#, fuzzy +msgid "" +"<command>apt-key</command> is the program that manages the list of keys used " +"by apt. It can be used to add or remove keys although an installation of " +"this release will automatically provide the default Debian archive signing " +"keys used in the Debian package repositories." +msgstr "" +"Le programme qui gère la liste des clés utilisées par apt s'appelle " +"<command>apt-key</command>. Il peut ajouter ou supprimer des clés. Cette " +"version installe automatiquement les clés qui servent à signer l'archive " +"Debian et les différents répertoires de paquets." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:143 +#, fuzzy +msgid "" +"In order to add a new key you need to first download it (you should make " +"sure you are using a trusted communication channel when retrieving it), add " +"it with <command>apt-key</command> and then run <command>apt-get update</" +"command> so that apt can download and verify the <filename>Release.gpg</" +"filename> files from the archives you have configured." +msgstr "" +"Pour ajouter une clé, vous devez d'abord la télécharger. Il vaut mieux " +"utiliser un canal fiable pour ce téléchargement. Ensuite vous l'ajoutez avec " +"la commande <command>apt-key</command> et vous lancez la commande " +"<command>apt-get update</command> pour télécharger et vérifier le fichier " +"<filename>Release.gpg</filename> de l'archive que vous avez configurée." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:152 +#, fuzzy +msgid "Archive configuration" +msgstr "Configuration d'une archive" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:154 +#, fuzzy +msgid "" +"If you want to provide archive signatures in an archive under your " +"maintenance you have to:" +msgstr "" +"Si vous voulez signer les archives dont vous avez la responsabilité, vous " +"devez :" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:159 +#, fuzzy +msgid "" +"<literal>Create a toplevel Release file</literal>. if it does not exist " +"already. You can do this by running <command>apt-ftparchive release</" +"command> (provided in apt-utils)." +msgstr "" +"créer un fichier Release à la racine de l'archive, s'il n'existe pas déjà. " +"Vous pouvez le créer avec la commande <command>apt-ftparchive release</" +"command> (fournie dans le paquet apt-utils) ;" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:164 +#, fuzzy +msgid "" +"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o " +"Release.gpg Release</command>." +msgstr "" +"le signer, avec la commande <command>gpg -abs -o Release.gpg Release</" +"command> ;" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:167 +#, fuzzy +msgid "" +"<literal>Publish the key fingerprint</literal>, that way your users will " +"know what key they need to import in order to authenticate the files in the " +"archive." +msgstr "" +"publier l'empreinte de la clé. Ainsi les utilisateurs de votre archive " +"connaîtront la clé qu'ils doivent importer pour authentifier les fichiers de " +"l'archive." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:174 +#, fuzzy +msgid "" +"Whenever the contents of the archive changes (new packages are added or " +"removed) the archive maintainer has to follow the first two steps previously " +"outlined." +msgstr "" +"Chaque fois que le contenu de l'archive change, le responsable doit refaire " +"les deux premières étapes." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:182 +#, fuzzy +msgid "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" +msgstr "" +"&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign;, &debsig-verify;, &gpg;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:186 +#, 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." +msgstr "" +"Pour des informations plus substantielles, vous pouvez consulter <ulink url=" +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\"> " +"l'infrastructure debian pour la sécurité</ulink> un chapitre du manuel " +"Debian sur la sécurité (disponible dans le paquet harden-doc) et le <ulink " +"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\">Strong " +"Distribution HOWTO</ulink> par V. Alex Brennen." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:199 +#, fuzzy +msgid "Manpage Authors" +msgstr "Auteurs" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:201 +#, fuzzy +msgid "" +"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgstr "" +"Cette page a été écrite à partir des travaux de Javier Fernández-Sanguino " +"Peña, Isaac Jones, Colin Walters, Florian Weimer et Michael Vogt." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:28 +#, fuzzy +msgid "apt-sortpkgs" +msgstr "apt-sortpkgs" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-sortpkgs.1.xml:29 +#, fuzzy +msgid "Utility to sort package index files" +msgstr "Un outil pour trier les index de paquets." + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-sortpkgs.1.xml:35 +#, fuzzy +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>option de configuration</replaceable></option></" +"arg> <arg><option>-c=<replaceable>fichier</replaceable></option></arg> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>fichier</replaceable></arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:44 +#, fuzzy +msgid "" +"<command>apt-sortpkgs</command> will take an index file (Source index or " +"Package index) and sort the records so that they are ordered by the package " +"name. It will also sort the internal fields of each record according to the " +"internal sorting rules." +msgstr "" +"<command>Apt-sortpkgs</command> prend un index (un index de Source ou un " +"index de paquet) et trie leurs enregistrements selon le nom de paquet. Un " +"tri des champs de chaque enregistrement est réalisé selon des règles " +"internes." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:50 +#, fuzzy +msgid "All output is sent to stdout, the input must be a seekable file." +msgstr "" +"Le résultat est envoyé sur la sortie standard ; l'entrée doit être un " +"fichier analysable." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-sortpkgs.1.xml:57 +#, fuzzy +msgid "<option>--source</option>" +msgstr "<option>--source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-sortpkgs.1.xml:59 +#, fuzzy +msgid "" +"Use Source index field ordering. Configuration Item: <literal>APT::" +"SortPkgs::Source</literal>." +msgstr "" +"Se servir d'un index de sources pour le tri des champs. Élément de " +"configuration : <literal>APT::SortPkgs::Source</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:73 +#, fuzzy +msgid "" +"<command>apt-sortpkgs</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " +"en cas d'erreur." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt.conf.5.xml:13 +#, fuzzy +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>10 December 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>11 " +"juillet 2008</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt.conf.5.xml:28 apt.conf.5.xml:34 +#, fuzzy +msgid "apt.conf" +msgstr "apt.conf" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 +#, fuzzy +msgid "5" +msgstr "5" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt.conf.5.xml:35 +#, fuzzy +msgid "Configuration file for APT" +msgstr "Fichier de configuration pour APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:39 +#, fuzzy +msgid "" +"<filename>apt.conf</filename> is the main configuration file for the APT " +"suite of tools, all tools make use of the configuration file and a common " +"command line parser to provide a uniform environment. When an APT tool " +"starts up it will read the configuration specified by the <envar>APT_CONFIG</" +"envar> environment variable (if any) and then read the files in " +"<literal>Dir::Etc::Parts</literal> then read the main configuration file " +"specified by <literal>Dir::Etc::main</literal> then finally apply the " +"command line options to override the configuration directives, possibly " +"loading even more config files." +msgstr "" +"Le fichier <filename>apt.conf</filename> est le principal fichier de " +"configuration de la collection d'outils que constitue APT ; tous les " +"outils font appel à ce fichier de configuration et utilisent un analyseur " +"syntaxique en ligne de commande commun afin de fournir un environnement " +"uniforme. Quand un outil d'APT démarre, il lit la configuration désignée par " +"variable d'environnement <envar>APT_CONFIG</envar> (si elle existe), puis il " +"lit les fichiers situés dans <literal>Dir::Etc::Parts</literal> ainsi que le " +"principal fichier de configuration indiqué par <literal>Dir::Etc::main</" +"literal> ; enfin il applique les options de la ligne de commande qui " +"prévalent sur les directives de configuration, chargeant si nécessaire " +"d'autres fichiers de configuration." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:49 +#, fuzzy +msgid "" +"The configuration file is organized in a tree with options organized into " +"functional groups. option specification is given with a double colon " +"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option " +"within the APT tool group, for the Get tool. options do not inherit from " +"their parent groups." +msgstr "" +"Le fichier de configuration est construit comme un arbre d'options " +"organisées en groupes fonctionnels. On se sert du double deux points " +"(« :: ») pour indiquer une option ; par exemple, " +"<literal>APT::Get::Assume-Yes</literal> est une option pour le groupe " +"d'outils APT, destinée à l'outil Get. Il n'y a pas d'héritage des options " +"des groupes parents." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:55 +#, fuzzy +msgid "" +"Syntactically the configuration language is modeled after what the ISC tools " +"such as bind and dhcp use. Lines starting with <literal>//</literal> are " +"treated as comments (ignored), as well as all text between <literal>/*</" +"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is " +"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing " +"semicolon is required and the quotes are optional. A new scope can be opened " +"with curly braces, like:" +msgstr "" +"Syntaxiquement, le langage de configuration est conçu sur le même modèle que " +"les langages utilisés par des outils ISC tels que bind et dhcp. Une ligne " +"qui commence par <literal>//</literal> est traitée comme un commentaire et " +"ignorée, de même que les sections de texte placées entre <literal>/*</" +"literal> et <literal>*/</literal>, tout comme les commentaires C/C++. " +"Chaque ligne est de la forme : <literal>APT::Get::Assume-Yes \"true\";</" +"literal> Le point-virgule final est obligatoire et les guillemets sont " +"optionnels. On peut déclarer un nouveau champ d'action avec des accolades, " +"comme suit :" + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:65 +#, fuzzy, no-wrap +msgid "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" +msgstr "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:73 +#, fuzzy +msgid "" +"with newlines placed to make it more readable. Lists can be created by " +"opening a scope and including a single string enclosed in quotes followed by " +"a semicolon. Multiple entries can be included, each separated by a semicolon." +msgstr "" +"avec des retours à la ligne pour faciliter la lecture. On peut créer une " +"liste en ouvrant un champ d'action et en y insérant une chaîne entre " +"guillemets suivie d'un point virgule pour chaque élément de la liste." + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:78 +#, fuzzy, no-wrap +msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:81 +#, fuzzy +msgid "" +"In general the sample configuration file in <filename>&docdir;examples/apt." +"conf</filename> &configureindex; is a good guide for how it should look." +msgstr "" +"Les modèles <filename>&docdir;examples/apt.conf</filename> et " +"&configureindex; montrent à quoi devrait ressembler le fichier de " +"configuration." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:85 +#, fuzzy +msgid "" +"The names of the configuration items are not case-sensitive. So in the " +"previous example you could use <literal>dpkg::pre-install-pkgs</literal>." +msgstr "" +"Les identifiants des options de configuration ne sont pas sensibles à la " +"casse. Dans l'exemple précédent, on pourrait donc aussi bien utiliser " +"<literal>dpkg::pre-install-pkgs</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:88 +#, fuzzy +msgid "" +"Two specials are allowed, <literal>#include</literal> and <literal>#clear</" +"literal> <literal>#include</literal> will include the given file, unless the " +"filename ends in a slash, then the whole directory is included. " +"<literal>#clear</literal> is used to erase a part of the configuration tree. " +"The specified element and all its descendents are erased." +msgstr "" +"Deux éléments spéciaux sont autorisés : <literal>#include</literal> et " +"<literal>#clear</literal>. <literal>#include</literal> inclut le fichier " +"donné en argument, à moins que le nom ne se termine par une barre oblique " +"auquel cas le répertoire entier est inclus. <literal>#clear</literal> sert à " +"effacer une partie de l'arbre de configuration. L'élément désigné et tout " +"ses descendants sont supprimés." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 +#, 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." +msgstr "" +"Tous les outils d'APT possèdent une option <option>-o</option> qui permet de " +"spécifier une configuration arbitraire depuis la ligne de commande. La " +"syntaxe consiste en un nom complet d'option (par exemple <literal>APT::Get::" +"Assume-Yes</literal>) suivi par un signe égal, puis par la nouvelle valeur " +"de l'option. On peut compléter une liste en ajoutant un « :: » au " +"nom de la liste." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:101 +#, fuzzy +msgid "The APT Group" +msgstr "Le groupe APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:102 +#, fuzzy +msgid "" +"This group of options controls general APT behavior as well as holding the " +"options for all of the tools." +msgstr "" +"Ce groupe d'options contrôle le comportement global d'APT et contient " +"également des options communes à tous les outils." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:106 +#, fuzzy +msgid "Architecture" +msgstr "Architecture" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:107 +#, fuzzy +msgid "" +"System Architecture; sets the architecture to use when fetching files and " +"parsing package lists. The internal default is the architecture apt was " +"compiled for." +msgstr "" +"L'architecture du système ; cette option positionne l'architecture à " +"utiliser pour récupérer des fichiers et analyser des listes de paquets. La " +"valeur interne par défaut est l'architecture pour laquelle APT a été compilé." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:112 +#, fuzzy +msgid "Default-Release" +msgstr "Default-Release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:113 +#, fuzzy +msgid "" +"Default release to install packages from if more than one version available. " +"Contains release name, codename or release version. Examples: 'stable', " +"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-" +"preferences;." +msgstr "" +"Indique la distribution à utiliser par défaut lors de l'installation d'un " +"paquet si plusieurs versions sont disponibles. La valeur peut être un nom de " +"distribution ou un numéro de version. Exemples : « stable », " +"« testing », « 4.0 », « 5.0* ». Les noms de codes " +"des distributions (« etch », « lenny », etc.) ne sont pas " +"permis pour l'instant. Voir aussi &apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:117 +#, fuzzy +msgid "Ignore-Hold" +msgstr "Ignore-Hold" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:118 +#, fuzzy +msgid "" +"Ignore Held packages; This global option causes the problem resolver to " +"ignore held packages in its decision making." +msgstr "" +"Ignore les paquets « gelés » ; cette option globale indique au " +"système de résolution de ne pas tenir compte des paquets « gelés » " +"dans sa prise de décision." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:122 +#, fuzzy +msgid "Clean-Installed" +msgstr "Clean-Installed" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:123 +#, fuzzy +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 " +"then packages that are locally installed are also excluded from cleaning - " +"but note that APT provides no direct means to reinstall them." +msgstr "" +"Avec cette option qui est activée par défaut, la fonctionnalité « " +"autoclean » supprime du cache tout paquet qui ne peut plus être " +"récupéré. Quand cette option est désactivée, les paquets qui sont installés " +"localement sont aussi exclus du nettoyage - mais notez que APT ne fournit " +"aucun moyen direct pour les réinstaller." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:129 +#, fuzzy +msgid "Immediate-Configure" +msgstr "Immediate-Configure" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:130 +#, fuzzy +msgid "" +"Disable Immediate Configuration; This dangerous option disables some of " +"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " +"necessary on some extremely slow single user systems but is very dangerous " +"and may cause package install scripts to fail or worse. Use at your own " +"risk." +msgstr "" +"Désactive la configuration immédiate ; cette dangereuse option " +"désactive une partie du code de mise en ordre de APT pour que ce dernier " +"effectue le moins d'appels possible à &dpkg;. Ça peut être nécessaire sur " +"des systèmes à un seul utilisateur extrêmement lents, mais cette option est " +"très dangereuse et peut faire échouer les scripts d'installation, voire " +"pire. Utilisez-la à vos risques et périls." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:137 +#, fuzzy +msgid "Force-LoopBreak" +msgstr "Force-LoopBreak" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:138 +#, fuzzy +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/" +"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH " +"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the " +"essential packages are not tar, gzip, libc, dpkg, bash or anything that " +"those packages depend on." +msgstr "" +"Ne jamais activer cette option à moins que vous ne sachiez - réellement - ce " +"que vous faites. Elle autorise APT à supprimer temporairement un paquet " +"essentiel pour mettre fin à une boucle Conflicts / Conflicts ou Conflicts / " +"Pre-Depends entre deux paquets essentiels. UNE TELLE BOUCLE NE DOIT JAMAIS " +"SE PRODUIRE : C'EST UN BOGUE SÉRIEUX. Cette option fonctionne si les " +"paquets essentiels ne sont pas tar, gzip, libc, dpkg, bash ou tous les " +"paquets dont ces paquets dépendent." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:146 +#, fuzzy +msgid "Cache-Limit" +msgstr "Cache-Limit" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:147 +#, fuzzy +msgid "" +"APT uses a fixed size memory mapped cache file to store the 'available' " +"information. This sets the size of that cache (in bytes)." +msgstr "" +"APT utilise un fichier de cache chargé en mémoire avec mmap pour ranger les " +"informations sur les paquets disponibles. Cette option fixe la taille " +"mémoire allouée pour le chargement de ce cache." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:151 +#, fuzzy +msgid "Build-Essential" +msgstr "Build-Essential" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:152 +#, fuzzy +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:155 +#, fuzzy +msgid "Get" +msgstr "Get" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:156 +#, fuzzy +msgid "" +"The Get subsection controls the &apt-get; tool, please see its documentation " +"for more information about the options here." +msgstr "" +"La sous-section <literal>Get</literal> contrôle l'outil &apt-get;, veuillez " +"consulter sa documentation pour avoir plus d'informations sur les options en " +"question." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:160 +#, fuzzy +msgid "Cache" +msgstr "Cache" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:161 +#, fuzzy +msgid "" +"The Cache subsection controls the &apt-cache; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"La sous-section <literal>Cache</literal> contrôle l'outil &apt-cache;, " +"veuillez consulter sa documentation pour avoir plus d'informations sur les " +"options en question." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:165 +#, fuzzy +msgid "CDROM" +msgstr "CDROM" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:166 +#, fuzzy +msgid "" +"The CDROM subsection controls the &apt-cdrom; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"La sous-section <literal>CDROM</literal> contrôle l'outil &apt-cdrom;, " +"veuillez consulter sa documentation pour avoir plus d'informations sur les " +"options en question." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:172 +#, fuzzy +msgid "The Acquire Group" +msgstr "Le groupe Acquire" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:177 +#, fuzzy +msgid "PDiffs" +msgstr "PDiffs" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:178 +#, fuzzy +msgid "" +"Try to download deltas called <literal>PDiffs</literal> for Packages or " +"Sources files instead of downloading whole ones. True by default." +msgstr "" +"Essayer de télécharger les fichiers différentiels appelés <literal>PDiffs</" +"literal> pour les paquets ou les fichiers sources, plutôt que de les " +"télécharger entièrement. Par défaut à « true »." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:183 +#, fuzzy +msgid "Queue-Mode" +msgstr "Queue-Mode" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:184 +#, fuzzy +msgid "" +"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" +"literal> or <literal>access</literal> which determines how APT parallelizes " +"outgoing connections. <literal>host</literal> means that one connection per " +"target host will be opened, <literal>access</literal> means that one " +"connection per URI type will be opened." +msgstr "" +"Le mode de file d'attente ; <literal>Queue-Mode</literal> peut prendre " +"les valeurs <literal>host</literal> ou <literal>access</literal> et cela " +"détermine comment APT parallélise les connexions sortantes. <literal>Host</" +"literal> signifie qu'une connexion par cible sera initiée, tandis que " +"<literal>access</literal> signifie qu'une connexion par type d'URI sera " +"initiée." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:191 +#, fuzzy +msgid "Retries" +msgstr "Retries" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:192 +#, fuzzy +msgid "" +"Number of retries to perform. If this is non-zero APT will retry failed " +"files the given number of times." +msgstr "" +"Nombre d'essais à effectuer. Si ce nombre n'est pas nul, APT essaie de " +"récupérer, le nombre donné de fois, les fichiers dont la récupération a " +"échoué." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:196 +#, fuzzy +msgid "Source-Symlinks" +msgstr "Source-Symlinks" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:197 +#, fuzzy +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 "" +"Utilise des liens symboliques pour les archives de sources. Positionnée à " +"« true », cette option crée si possible des liens symboliques vers " +"les 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:201 sources.list.5.xml:138 +#, fuzzy +msgid "http" +msgstr "http" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:202 +#, fuzzy +msgid "" +"HTTP URIs; http::Proxy is the default http proxy to use. It is in the " +"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " +"host proxies can also be specified by using the form <literal>http::Proxy::" +"<host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. The <envar>http_proxy</envar> environment " +"variable will override all settings." +msgstr "" +"URI HTTP ; http::Proxy est le mandataire (proxy) HTTP à utiliser par " +"défaut. Il se présente sous la forme standard : <literal>http://[[user]" +"[:pass]@]host[:port]/</literal>. On peut spécifier un mandataire particulier " +"par hôte distant en utilisant la syntaxe : <literal>http::Proxy::<" +"hôte></literal>. Le mot-clé spécial <literal>DIRECT</literal> indique " +"alors de n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, " +"la variable d'environnement <envar>http_proxy</envar> annule et remplace " +"toutes les options de mandataire HTTP." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:209 +#, fuzzy +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 " +"response under any circumstances, <literal>Max-Age</literal> is sent only " +"for index files and tells the cache to refresh its object if it is older " +"than the given number of seconds. Debian updates its index files daily so " +"the default is 1 day. <literal>No-Store</literal> specifies that the cache " +"should never store this request, it is only set for archive files. This may " +"be useful to prevent polluting a proxy cache with very large .deb files. " +"Note: Squid 2.0.2 does not support any of these options." +msgstr "" +"Trois options de configuration sont fournies pour le contrôle des caches " +"compatibles avec HTTP/1.1. <literal>No-Cache</literal> signifie que le " +"mandataire ne doit jamais utiliser les réponses qu'il a stockées ; " +"<literal>Max-Age</literal> sert uniquement pour les fichiers d'index : " +"cela demande au cache de les mettre à jour quand leur ancienneté est " +"supérieure au nombre de secondes donné. Debian met à jour ses fichiers " +"d'index de manière quotidienne ; la valeur par défaut est donc de 1 " +"jour. <literal>No-Store</literal> sert uniquement pour les fichiers " +"d'archive  et demande au cache de ne jamais garder la requête. Cela " +"peut éviter de polluer un cache mandataire avec des fichiers .deb très " +"grands. Note : Squid 2.0.2 ne prend en compte aucune de ces options." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:219 apt.conf.5.xml:267 +#, fuzzy +msgid "" +"The option <literal>timeout</literal> sets the timeout timer used by the " +"method, this applies to all things including connection timeout and data " +"timeout." +msgstr "" +"#-#-#-#-# apt.conf.fr.5.xml:278 #-#-#-#-#\n" +"L'option <literal>timeout</literal> positionne le compteur de temps mort " +"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et " +"données.\n" +"#-#-#-#-# apt.conf.fr.5.xml:336 #-#-#-#-#\n" +"L'option <literal>timeout</literal> positionne le compteur de temps mort " +"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:222 +#, fuzzy +msgid "" +"One setting is provided to control the pipeline depth in cases where the " +"remote server is not RFC conforming or buggy (such as Squid 2.0.2) " +"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 " +"indicating how many outstanding requests APT should send. A value of zero " +"MUST be specified if the remote host does not properly linger on TCP " +"connections - otherwise data corruption will occur. Hosts which require this " +"are in violation of RFC 2068." +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, on DOIT donner une valeur égale à 0 -- " +"sinon des données seront corrompues. Les machines qui ont besoin de cette " +"option ne respectent pas la RFC 2068." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:231 +#, fuzzy +msgid "https" +msgstr "https" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:232 +#, fuzzy +msgid "" +"HTTPS URIs. Cache-control and proxy options are the same as for " +"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"not supported yet." +msgstr "" +"URI HTTPS. Les options de contrôle de cache et de mandataire (proxy) sont " +"les mêmes que pour la méthode <literal>http</literal>. L'option " +"<literal>Pipeline-Depth</literal> n'est pas encore supportée." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:236 +#, fuzzy +msgid "" +"<literal>CaInfo</literal> suboption specifies place of file that holds info " +"about trusted certificates. <literal><host>::CaInfo</literal> is " +"corresponding per-host option. <literal>Verify-Peer</literal> boolean " +"suboption determines whether verify server's host certificate against " +"trusted certificates or not. <literal><host>::Verify-Peer</literal> " +"is corresponding per-host option. <literal>Verify-Host</literal> boolean " +"suboption determines whether verify server's hostname or not. <literal><" +"host>::Verify-Host</literal> is corresponding per-host option. " +"<literal>SslCert</literal> determines what certificate to use for client " +"authentication. <literal><host>::SslCert</literal> is corresponding " +"per-host option. <literal>SslKey</literal> determines what private key to " +"use for client authentication. <literal><host>::SslKey</literal> is " +"corresponding per-host option. <literal>SslForceVersion</literal> overrides " +"default SSL version to use. Can contain 'TLSv1' or 'SSLv3' string. " +"<literal><host>::SslForceVersion</literal> is corresponding per-host " +"option." +msgstr "" +"La sous-option <literal>CaInfo</literal> spécifie le fichier contenant les " +"informations sur les certificats de confiance. La sous-option booléenne " +"<literal>Verify-Peer</literal> précise si le certificat d'hôte du serveur " +"doit être confronté aux certificats de confiance ou pas. La sous-option " +"booléenne <literal>Verify-Host</literal> précise s'il faut vérifier ou pas " +"le nom d'hôte du serveur. <literal>SslCert</literal> détermine le certificat " +"à utiliser pour l'authentification du client. <literal>SslKey</literal> " +"détermine quelle clef privée doit être utilisée pour l'authentification du " +"client. <literal>SslForceVersion</literal> surcharge la valeur par défaut " +"pour la version de SSL à utiliser et peut contenir l'une des chaînes 'TLSv1' " +"ou 'SSLv3'." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:254 sources.list.5.xml:149 +#, fuzzy +msgid "ftp" +msgstr "ftp" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:255 +#, fuzzy +msgid "" +"FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " +"standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and " +"is overridden by the <envar>ftp_proxy</envar> environment variable. To use a " +"ftp proxy you will have to set the <literal>ftp::ProxyLogin</literal> script " +"in the configuration file. This entry specifies the commands to send to tell " +"the proxy server what to connect to. Please see &configureindex; for an " +"example of how to do this. The substitution variables available are <literal>" +"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>" +"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</" +"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's " +"respective URI component." +msgstr "" +"URI FTP ; ftp::Proxy est le mandataire (proxy) FTP à utiliser par " +"défaut. Il se présente sous la forme standard : <literal>ftp://[[user]" +"[:pass]@]host[:port]/</literal>. On peut spécifier un mandataire particulier " +"par hôte distant en utilisant la syntaxe : <literal>ftp::Proxy::<" +"hôte></literal>. Le mot-clé spécial <literal>DIRECT</literal> indique " +"alors de n'utiliser aucun mandataire pour l'hôte. Lorsqu'elle est définie, " +"la variable d'environnement <envar>ftp_proxy</envar> annule et replace " +"toutes les options de mandataire FTP. Pour utiliser un mandataire FTP, vous " +"devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le " +"fichier de configuration. Cette entrée spécifie les commandes à envoyer au " +"mandataire pour lui préciser à quoi il doit se connecter. Voyez " +"&configureindex; pour savoir comment faire. Les variables de substitution " +"disponibles sont : <literal>$(PROXY_USER)</literal>, <literal>" +"$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, <literal>" +"$(SITE_PASS)</literal>, <literal>$(SITE)</literal> et <literal>$(SITE_PORT)</" +"literal>. Chacune correspond à l'élément respectif de l'URI." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:270 +#, fuzzy +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 " +"some situations require that passive mode be disabled and port mode ftp used " +"instead. This can be done globally, for connections that go through a proxy " +"or for a specific host (See the sample config file for examples)." +msgstr "" +"Plusieurs options de configuration sont fournies pour contrôler le mode " +"passif. Il est généralement plus sûr d'activer le mode passif et cela marche " +"dans presque tous les environnements. Cependant, certaines situations " +"nécessitent que le mode passif soit désactivé et que le mode « " +"port » de ftp soit utilisé à la place. On peut le faire globalement, " +"pour des connexions qui passent par un mandataire ou pour une machine " +"spécifique (examinez le modèle de fichier de configuration)." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:277 +#, fuzzy +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 " +"method above for syntax. You cannot set this in the configuration file and " +"it is not recommended to use FTP over HTTP due to its low efficiency." +msgstr "" +"Il est possible de faire transiter le trafic FTP par un mandataire HTTP en " +"positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL " +"HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas " +"le faire dans le fichier de configuration et il n'est de toute façon pas " +"recommandé d'utiliser FTP au travers de HTTP en raison la faible efficacité " +"de cette méthode." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:282 +#, fuzzy +msgid "" +"The setting <literal>ForceExtended</literal> controls the use of RFC2428 " +"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " +"false, which means these commands are only used if the control connection is " +"IPv6. Setting this to true forces their use even on IPv4 connections. Note " +"that most FTP servers do not support RFC2428." +msgstr "" +"L'option <literal>ForceExtended</literal> contrôle l'utilisation des " +"commandes liées à la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</" +"literal>. Par défaut, elle vaut « false » ce qui signifie que ces " +"commandes ne sont utilisées que pour une connexion de type IPv6. Quand elle " +"vaut « true », on les utilise même si la connexion est de type " +"IPv4. La plupart des serveurs FTP ne suivent pas la RFC 2428." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:289 sources.list.5.xml:131 +#, fuzzy +msgid "cdrom" +msgstr "cdrom" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:295 +#, fuzzy, no-wrap +msgid "\"/cdrom/\"::Mount \"foo\";" +msgstr "\"/cdrom/\"::Mount \"foo\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:290 +#, fuzzy +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 " +"drive as specified in <filename>/etc/fstab</filename>. It is possible to " +"provide alternate mount and unmount commands if your mount point cannot be " +"listed in the fstab (such as an SMB mount and old mount packages). The " +"syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the " +"cdrom block. It is important to have the trailing slash. Unmount commands " +"can be specified using UMount." +msgstr "" +"URI cédérom ; la seule option de configuration pour les URI de cédérom " +"est le point de montage : <literal>cdrom::Mount</literal> ; il " +"doit représenter le point de montage du lecteur de cédérom indiqué dans " +"<filename>/etc/fstab</filename>. On peut fournir d'autres commandes de " +"montage et de démontage quand le point de montage ne peut être listé dans le " +"fichier <filename>/etc/fstab</filename> (par exemple, un montage SMB). " +"Syntaxiquement, il faut placer <placeholder type=\"literallayout\" id=\"0\"/" +"> dans le bloc cdrom. La barre oblique finale est importante. Les commandes " +"de démontage peuvent être spécifiées en utilisant <literal>UMount</literal>." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:300 +#, fuzzy +msgid "gpgv" +msgstr "gpgv" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:301 +#, fuzzy +msgid "" +"GPGV URIs; the only option for GPGV URIs is the option to pass additional " +"parameters to gpgv. <literal>gpgv::Options</literal> Additional options " +"passed to gpgv." +msgstr "" +"URI GPGV ; la seule option pour les URI GPGV est celle qui permet de " +"passer des paramètres à gpgv. <literal>gpgv::Options</literal> : " +"options supplémentaires passées à gpgv." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:173 +#, fuzzy +msgid "" +"The <literal>Acquire</literal> group of options controls the download of " +"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Le groupe d'options <literal>Acquire</literal> contrôle le téléchargement " +"des paquets et les gestionnaires d'URI. <placeholder type=\"variablelist\" " +"id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:310 +#, fuzzy +msgid "Directories" +msgstr "Les répertoires" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:312 +#, 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>." +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 " +"listes de paquets téléchargés et <literal>status</literal> est le nom du " +"fichier d'état de &dpkg;. <literal>preferences</literal> concerne " +"APT : c'est le nom du fichier des préférences. <literal>Dir::State</" +"literal> contient le répertoire par défaut préfixé à tous les sous-éléments, " +"quand ceux-ci ne commencent pas par <filename>/</filename> ou <filename>./</" +"filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:319 +#, fuzzy +msgid "" +"<literal>Dir::Cache</literal> contains locations pertaining to local cache " +"information, such as the two package caches <literal>srcpkgcache</literal> " +"and <literal>pkgcache</literal> as well as the location to place downloaded " +"archives, <literal>Dir::Cache::archives</literal>. Generation of caches can " +"be turned off by setting their names to be blank. This will slow down " +"startup but save disk space. It is probably preferred to turn off the " +"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " +"default directory is contained in <literal>Dir::Cache</literal>" +msgstr "" +"<literal>Dir::Cache</literal> contient les emplacements qui renseignent sur " +"le cache local : par exemple, les deux caches de paquets " +"<literal>srcpkgcache</literal> et <literal>pkgcache</literal>, et aussi " +"l'endroit où sont placées les archives téléchargées, <literal>Dir::Cache::" +"archives</literal>. On peut empêcher la création des caches en saisissant un " +"nom vide. Cela ralentit le démarrage mais sauve de l'espace disque. Il vaut " +"mieux se passer du cache <literal>pkgcache</literal> plutôt que se passer du " +"cache <literal>srcpkgcache</literal>. Comme pour <literal>Dir::State</" +"literal>, le répertoire par défaut est contenu dans <literal>Dir::Cache</" +"literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:328 +#, fuzzy +msgid "" +"<literal>Dir::Etc</literal> contains the location of configuration files, " +"<literal>sourcelist</literal> gives the location of the sourcelist and " +"<literal>main</literal> is the default configuration file (setting has no " +"effect, unless it is done from the config file specified by " +"<envar>APT_CONFIG</envar>)." +msgstr "" +"<literal>Dir::Etc</literal> contient l'emplacement des fichiers de " +"configuration, <literal>sourcelist</literal> indique l'emplacement de la " +"liste de sources et <literal>main</literal> est le fichier de configuration " +"par défaut (le modifier n'a aucun effet, à moins qu'on ne le modifie avec le " +"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:334 +#, fuzzy +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 " +"main config file is loaded." +msgstr "" +"<literal>Dir::Parts</literal> lit, par ordre d'entrée, tous les fragments de " +"configuration dans le répertoire indiqué. Ensuite, le fichier principal de " +"configuration est chargé." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:338 +#, fuzzy +msgid "" +"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" +"Bin::Methods</literal> specifies the location of the method handlers and " +"<literal>gzip</literal>, <literal>dpkg</literal>, <literal>apt-get</literal> " +"<literal>dpkg-source</literal> <literal>dpkg-buildpackage</literal> and " +"<literal>apt-cache</literal> specify the location of the respective programs." +msgstr "" +"Les programmes binaires sont pointés par <literal>Dir::Bin</literal>. " +"L'emplacement des gestionnaires de méthodes est indiqué par <literal>Dir::" +"Bin::Methods</literal> ; <literal>gzip</literal>, <literal>dpkg</" +"literal>, <literal>apt-get</literal>, <literal>dpkg-source</literal>, " +"<literal>dpkg-buildpackage</literal> et <literal>apt-cache</literal> " +"indiquent l'emplacement des programmes correspondants." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:345 +#, fuzzy +msgid "" +"The configuration item <literal>RootDir</literal> has a special meaning. If " +"set, all paths in <literal>Dir::</literal> will be relative to " +"<literal>RootDir</literal>, <emphasis>even paths that are specified " +"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is " +"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</" +"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the " +"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</" +"filename>." +msgstr "" +"L'option de configuration <literal>RootDir</literal> a une signification " +"particulière. Lorsqu'elle est définie, tous les chemins déclarés dans " +"<literal>Dir::</literal> sont considérés relativement à <literal>RootDir</" +"literal>, <emphasis>même les chemins spécifiés de manière absolue</" +"emphasis>. Ainsi par exemple si <literal>RootDir</literal> est défini comme " +"<filename>/tmp/staging</filename>, et que chemin du fichier d'état " +"<literal>Dir::State::status</literal> est déclaré comme <filename>/var/lib/" +"dpkg/status</filename> alors ce fichier sera cherché dans <filename>/tmp/" +"staging/var/lib/dpkg/status</filename>." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:358 +#, fuzzy +msgid "APT in DSelect" +msgstr "APT et DSelect" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:360 +#, fuzzy +msgid "" +"When APT is used as a &dselect; method several configuration directives " +"control the default behaviour. These are in the <literal>DSelect</literal> " +"section." +msgstr "" +"Quand APT est utilisé comme une méthode de &dselect;, plusieurs directives " +"contrôlent le comportement par défaut. On les trouve dans la section " +"<literal>DSelect</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:364 +#, fuzzy +msgid "Clean" +msgstr "Clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:365 +#, fuzzy +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 " +"upgrading, prompt (the default) does so conditionally. auto removes only " +"those packages which are no longer downloadable (replaced with a new version " +"for instance). pre-auto performs this action before downloading new " +"packages." +msgstr "" +"Mode de nettoyage du cache ; cette variable peut prendre l'une des " +"valeurs suivantes : « always », « prompt », « " +"auto », « pre-auto » et « never ». « " +"always » et « prompt » suppriment tous les paquets du cache " +"après la mise à niveau ; « prompt » (valeur par défaut) les " +"supprime après une demande et « auto » ne supprime que les archives " +"qui ne peuvent plus être téléchargées (remplacées, par exemple, par une " +"nouvelle version). « pre-auto » les supprime avant de récupérer de " +"nouveaux paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:374 +#, fuzzy +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the install phase." +msgstr "" +"Le contenu de cette variable est passé comme options de ligne de commande à " +"&apt-get; lors de la phase d'installation." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:378 +#, fuzzy +msgid "Updateoptions" +msgstr "UpdateOptions" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:379 +#, fuzzy +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the update phase." +msgstr "" +"Le contenu de cette variable est passé comme options de ligne de commande à " +"&apt-get; lors de la phase de mise à jour." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:383 +#, fuzzy +msgid "PromptAfterUpdate" +msgstr "PromptAfterUpdate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:384 +#, fuzzy +msgid "" +"If true the [U]pdate operation in &dselect; will always prompt to continue. " +"The default is to prompt only on error." +msgstr "" +"Si cette option est « vraie », l'opération [U]pdate de &dselect; " +"interroge toujours l'utilisateur avant de continuer. Par défaut, ce n'est " +"qu'en cas d'erreur que l'on propose à l'utilisateur d'intervenir." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:390 +#, fuzzy +msgid "How APT calls dpkg" +msgstr "Comment APT appelle &dpkg;" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:391 +#, fuzzy +msgid "" +"Several configuration directives control how APT invokes &dpkg;. These are " +"in the <literal>DPkg</literal> section." +msgstr "" +"Plusieurs directives de configuration contrôlent la manière dont APT invoque " +"&dpkg; : elles figurent dans la section <literal>DPkg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:396 +#, fuzzy +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 " +"&dpkg;." +msgstr "" +"Il s'agit d'une liste d'options à passer à &dpkg;. Les options doivent être " +"déclarées en utilisant la notation de liste et chaque élément de la liste " +"est passé comme un seul argument à &dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:401 +#, fuzzy +msgid "Pre-Invoke" +msgstr "Pre-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:401 +#, fuzzy +msgid "Post-Invoke" +msgstr "Post-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:402 +#, fuzzy +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort." +msgstr "" +"Il s'agit d'une liste de commandes shell à exécuter avant ou après l'appel " +"de &dpkg;. Tout comme pour <literal>Options</literal>, on doit utiliser la " +"notation de liste. Les commandes sont appelées dans l'ordre, en utilisant " +"<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:408 +#, fuzzy +msgid "Pre-Install-Pkgs" +msgstr "Pre-Install-Pkgs" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:409 +#, fuzzy +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort. APT will pass to the commands on standard input the " +"filenames of all .deb files it is going to install, one per line." +msgstr "" +"Il s'agit d'une liste de commandes shell à exécuter avant d'appeler &dpkg;. " +"Tout comme pour <literal>Options</literal>, on doit utiliser la notation de " +"liste. Les commandes sont appelées dans l'ordre, en utilisant <filename>/" +"bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue. Sur " +"l'entrée standard, APT transmet aux commandes les noms de tous les fichiers ." +"deb qu'il va installer, à raison d'un par ligne." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:415 +#, fuzzy +msgid "" +"Version 2 of this protocol dumps more information, including the protocol " +"version, the APT configuration space and the packages, files and versions " +"being changed. Version 2 is enabled by setting <literal>DPkg::Tools::" +"options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command " +"given to <literal>Pre-Install-Pkgs</literal>." +msgstr "" +"La deuxième version de ce protocole donne plus de renseignements : on " +"obtient la version du protocole, la configuration de APT et les paquets, " +"fichiers ou versions qui ont changé. On autorise cette version en " +"positionnant <literal>DPkg::Tools::Options::cmd::Version</literal> à 2. " +"<literal>cmd</literal> est une commande passée à <literal>Pre-Install-Pkgs</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:422 +#, fuzzy +msgid "Run-Directory" +msgstr "Run-Directory" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:423 +#, fuzzy +msgid "" +"APT chdirs to this directory before invoking dpkg, the default is <filename>/" +"</filename>." +msgstr "" +"APT se place dans ce répertoire avant d'appeler &dpkg; ; par défaut " +"c'est le répertoire <filename>/</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:427 +#, fuzzy +msgid "Build-options" +msgstr "Build-Options" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:428 +#, fuzzy +msgid "" +"These options are passed to &dpkg-buildpackage; when compiling packages, the " +"default is to disable signing and produce all binaries." +msgstr "" +"Ces options sont passées à &dpkg-buildpackage; lors de la compilation des " +"paquets ; par défaut la signature est désactivée et tous les binaires " +"sont créés." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:435 +#, fuzzy +msgid "Periodic and Archives options" +msgstr "Options « Periodic » et « Archive »" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:436 +#, fuzzy +msgid "" +"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " +"of options configure behavior of apt periodic updates, which is done by " +"<literal>/etc/cron.daily/apt</literal> script. See header of this script for " +"the brief documentation of these options." +msgstr "" +"Les groupes d'options <literal>APT::Periodic</literal> et <literal>APT::" +"Archive</literal> configurent les comportements périodiques réalisés par le " +"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:444 +#, fuzzy +msgid "Debug options" +msgstr "Les options de débogage" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:446 +#, fuzzy +msgid "" +"Enabling options in the <literal>Debug::</literal> section will cause " +"debugging information to be sent to the standard error stream of the program " +"utilizing the <literal>apt</literal> libraries, or enable special program " +"modes that are primarily useful for debugging the behavior of <literal>apt</" +"literal>. Most of these options are not interesting to a normal user, but a " +"few may be:" +msgstr "" +"Les options de la section <literal>Debug::</literal> servent soit à " +"provoquer l'affichage d'informations de débogage sur la sortie d'erreur " +"standard du programme qui utilise les librairies APT, soit à activer des " +"modes de fonctionnement spéciaux qui sont principalement utiles pour " +"déboguer le comportement de <literal>APT</literal>. La plupart de ces " +"options n'ont pas d'intérêt pour un utilisateur normal, mais certaines " +"peuvent tout de même être utiles :" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:457 +#, fuzzy +msgid "" +"<literal>Debug::pkgProblemResolver</literal> enables output about the " +"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" +"literal>." +msgstr "" +"<literal>Debug::pkgProblemResolver</literal> affiche d'intéressantes " +"informations sur les décisions prises par les commandes <literal>dist-" +"upgrade, upgrade, install, remove et purge</literal>." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:465 +#, fuzzy +msgid "" +"<literal>Debug::NoLocking</literal> disables all file locking. This can be " +"used to run some operations (for instance, <literal>apt-get -s install</" +"literal>) as a non-root user." +msgstr "" +"<literal>Debug::NoLocking</literal> désactive le verrouillage de fichier de " +"manière à ce que APT puisse effectuer quelques opérations (telles que " +"<literal>apt-get -s install</literal>) sans être « root »." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:474 +#, fuzzy +msgid "" +"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " +"time that <literal>apt</literal> invokes &dpkg;." +msgstr "" +"<literal>Debug::pkgDPkgPM</literal> affiche la ligne de commande à chaque " +"appel de &dpkg;." + +#. TODO: provide a +#. 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:482 +#, fuzzy +msgid "" +"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " +"in CDROM IDs." +msgstr "" +"<literal>Debug::IdentCdrom</literal> désactive l'inclusion de données de " +"type statfs dans les ID de cédérom." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:492 +#, fuzzy +msgid "A full list of debugging options to apt follows." +msgstr "Voici une liste complète des options de débogage de APT." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +#, fuzzy +msgid "<literal>Debug::Acquire::cdrom</literal>" +msgstr "Debug::Acquire::cdrom" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:501 +#, fuzzy +msgid "Print information related to accessing <literal>cdrom://</literal> sources." +msgstr "Affiche les informations concernant les sources de type cdrom://" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:508 +#, fuzzy +msgid "<literal>Debug::Acquire::ftp</literal>" +msgstr "Debug::Acquire::ftp" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:512 +#, fuzzy +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:519 +#, fuzzy +msgid "<literal>Debug::Acquire::http</literal>" +msgstr "Debug::Acquire::http" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:523 +#, fuzzy +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:530 +#, fuzzy +msgid "<literal>Debug::Acquire::https</literal>" +msgstr "Debug::Acquire::https" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:534 +#, fuzzy +msgid "Print information related to downloading packages using HTTPS." +msgstr "Affiche les informations concernant le téléchargement de paquets par HTTPS." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:541 +#, fuzzy +msgid "<literal>Debug::Acquire::gpgv</literal>" +msgstr "Debug::Acquire::gpgv" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:545 +#, fuzzy +msgid "" +"Print information related to verifying cryptographic signatures using " +"<literal>gpg</literal>." +msgstr "" +"Affiche les informations relatives à la vérification de signatures " +"cryptographiques avec <literal>gpg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:552 +#, fuzzy +msgid "<literal>Debug::aptcdrom</literal>" +msgstr "Debug::aptcdrom" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:556 +#, fuzzy +msgid "" +"Output information about the process of accessing collections of packages " +"stored on CD-ROMs." +msgstr "" +"Affiche des informations concernant l'accès aux collections de paquets " +"stockées sur cédérom." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:563 +#, fuzzy +msgid "<literal>Debug::BuildDeps</literal>" +msgstr "Debug::BuildDeps" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:566 +#, fuzzy +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:573 +#, fuzzy +msgid "<literal>Debug::Hashes</literal>" +msgstr "Debug::Hashes" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:576 +#, fuzzy +msgid "" +"Output each cryptographic hash that is generated by the <literal>apt</" +"literal> libraries." +msgstr "" +"Affiche toutes les clefs de hachage cryptographiques générées par les " +"librairies APT." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:583 +#, fuzzy +msgid "<literal>Debug::IdentCDROM</literal>" +msgstr "Debug::IdentCdrom" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:586 +#, fuzzy +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 " +"a CD-ROM." +msgstr "" +"Désactive l'inclusion des données de type <literal>statfs</literal> pour la " +"génération des ID de cédérom, à savoir le nombre de blocs libres et utilisés " +"sur le système de fichier du cédérom." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:594 +#, fuzzy +msgid "<literal>Debug::NoLocking</literal>" +msgstr "Debug::NoLocking" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:597 +#, fuzzy +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 "" +"Désactive le verrouillage de fichiers. Cela permet par exemple de lancer " +"deux instances de « apt-get update » en même temps." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:605 +#, fuzzy +msgid "<literal>Debug::pkgAcquire</literal>" +msgstr "Debug::pkgAcquire" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:609 +#, fuzzy +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:616 +#, fuzzy +msgid "<literal>Debug::pkgAcquire::Auth</literal>" +msgstr "Debug::pkgAcquire::Auth" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:619 +#, fuzzy +msgid "" +"Output status messages and errors related to verifying checksums and " +"cryptographic signatures of downloaded files." +msgstr "" +"Affiche les détails de la vérification des sommes de contrôle et des " +"signatures cryptographiques des fichiers téléchargés, ainsi que les erreurs " +"éventuelles." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:626 +#, fuzzy +msgid "<literal>Debug::pkgAcquire::Diffs</literal>" +msgstr "Debug::pkgAcquire::Diffs" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:629 +#, fuzzy +msgid "" +"Output information about downloading and applying package index list diffs, " +"and errors relating to package index list diffs." +msgstr "" +"Affiche les informations de téléchargement et de prise en compte des " +"fichiers différentiels des indexes de paquets, ainsi que les erreurs " +"éventuelles." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:637 +#, fuzzy +msgid "<literal>Debug::pkgAcquire::RRed</literal>" +msgstr "Debug::pkgAcquire::RRed" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:641 +#, fuzzy +msgid "" +"Output information related to patching apt package lists when downloading " +"index diffs instead of full indices." +msgstr "" +"Affiche les détails de la vérification des sommes de contrôle et des " +"signatures cryptographiques des fichiers téléchargés, ainsi que les erreurs " +"éventuelles." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:648 +#, fuzzy +msgid "<literal>Debug::pkgAcquire::Worker</literal>" +msgstr "Debug::pkgAcquire::Worker" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:652 +#, fuzzy +msgid "Log all interactions with the sub-processes that actually perform downloads." +msgstr "" +"Affiche toutes les interactions avec les processus enfants qui se chargent " +"effectivement des téléchargements." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:659 +#, fuzzy +msgid "<literal>Debug::pkgAutoRemove</literal>" +msgstr "Debug::pkgAcquire::pkgAutoRemove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:663 +#, fuzzy +msgid "" +"Log events related to the automatically-installed status of packages and to " +"the removal of unused packages." +msgstr "" +"Affiche les changements concernant le marquage des paquets comme installés " +"automatiquement, et la suppression des paquets inutiles." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:670 +#, fuzzy +msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" +msgstr "Debug::pkgDepCache::AutoInstall" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:673 +#, fuzzy +msgid "" +"Generate debug messages describing which packages are being automatically " +"installed to resolve dependencies. This corresponds to the initial auto-" +"install pass performed in, e.g., <literal>apt-get install</literal>, and not " +"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::" +"pkgProblemResolver</literal> for that." +msgstr "" +"Génère les informations de débogage décrivant quels paquets sont installés " +"automatiquement pour satisfaire les dépendances. Cela concerne la passe " +"initiale d'installation automatique effectuée par exemple par <literal>apt-" +"get install</literal> et pas le système de résolution de dépendances complet " +"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce " +"dernier." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:684 +#, fuzzy +msgid "<literal>Debug::pkgDepCache::Marker</literal>" +msgstr "Debug::pkgDepCache::AutoInstall" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:687 +msgid "" +"Generate debug messages describing which package is marked as keep/install/" +"remove while the ProblemResolver does his work. Each addition or deletion " +"may trigger additional actions; they are shown indented two additional space " +"under the original entry. The format for each line is <literal>MarkKeep</" +"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> " +"followed by <literal>package-name <a.b.c -> d.e.f | x.y.z> (section)" +"</literal> where <literal>a.b.c</literal> is the current version of the " +"package, <literal>d.e.f</literal> is the version considered for installation " +"and <literal>x.y.z</literal> is a newer version, but not considered for " +"installation (because of a low pin score). The later two can be omitted if " +"there is none or if it is the same version as the installed. " +"<literal>section</literal> is the name of the section the package appears in." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:706 +#, fuzzy +msgid "<literal>Debug::pkgInitConfig</literal>" +msgstr "Debug::pkgInitConfig" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:709 +#, fuzzy +msgid "Dump the default configuration to standard error on startup." +msgstr "" +"Au lancement, affiche l'ensemble de la configuration sur la sortie d'erreur " +"standard." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:716 +#, fuzzy +msgid "<literal>Debug::pkgDPkgPM</literal>" +msgstr "Debug::pkgDPkgPM" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:719 +#, fuzzy +msgid "" +"When invoking &dpkg;, output the precise command line with which it is being " +"invoked, with arguments separated by a single space character." +msgstr "" +"Affiche la commande exacte d'invocation de &dpkg; à chaque appel ; les " +"arguments sont séparés par des espaces." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:727 +#, fuzzy +msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" +msgstr "Debug::pkgDPkgProgressReporting" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:730 +#, fuzzy +msgid "" +"Output all the data received from &dpkg; on the status file descriptor and " +"any errors encountered while parsing it." +msgstr "" +"Affiche l'ensemble des informations reçues de &dpkg; par l'intermédiaire du " +"descripteur de fichier d'état, et les éventuelles erreurs d'analyse de ce " +"fichier." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:737 +#, fuzzy +msgid "<literal>Debug::pkgOrderList</literal>" +msgstr "Debug::pkgOrderList" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:741 +#, fuzzy +msgid "" +"Generate a trace of the algorithm that decides the order in which " +"<literal>apt</literal> should pass packages to &dpkg;." +msgstr "" +"Affiche les étapes de l'algorithme utilisé pour choisir l'ordre dans lequel " +"APT passe les paquets à &dpkg;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:749 +#, fuzzy +msgid "<literal>Debug::pkgPackageManager</literal>" +msgstr "Debug::pkgPackageManager" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:753 +#, fuzzy +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:760 +#, fuzzy +msgid "<literal>Debug::pkgPolicy</literal>" +msgstr "Debug::pkgPolicy" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:764 +#, fuzzy +msgid "Output the priority of each package list on startup." +msgstr "Au lancement, affiche la priorité de chaque liste de paquets." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:770 +#, fuzzy +msgid "<literal>Debug::pkgProblemResolver</literal>" +msgstr "Debug::pkgProblemResolver" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:774 +#, fuzzy +msgid "" +"Trace the execution of the dependency resolver (this applies only to what " +"happens when a complex dependency problem is encountered)." +msgstr "" +"Affiche la trace d'exécution du système de résolution de dépendances (ne " +"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:782 +#, fuzzy +msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" +msgstr "Debug::pkgProblemResolver" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:785 +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 " +"described in <literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:793 +#, fuzzy +msgid "<literal>Debug::sourceList</literal>" +msgstr "Debug::sourceList" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:797 +#, fuzzy +msgid "" +"Print information about the vendors read from <filename>/etc/apt/vendors." +"list</filename>." +msgstr "" +"Affiche les fournisseurs déclarés dans le fichier <filename>/etc/apt/vendors." +"list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:819 +#, fuzzy +msgid "" +"&configureindex; is a configuration file showing example values for all " +"possible options." +msgstr "" +"Le fichier &configureindex; contient un modèle de fichier montrant des " +"exemples pour toutes les options existantes." + +#. ? reading apt.conf +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:829 +#, fuzzy +msgid "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-cache; &apt-conf;" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt_preferences.5.xml:13 +#, fuzzy +msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgstr "&apt-author.team; &apt-email; &apt-product; <date>29 Février 2004</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt_preferences.5.xml:21 apt_preferences.5.xml:27 +#, fuzzy +msgid "apt_preferences" +msgstr "apt_preferences" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt_preferences.5.xml:28 +#, fuzzy +msgid "Preference control file for APT" +msgstr "Un fichier de contrôle des préférences pour APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:33 +#, fuzzy +msgid "" +"The APT preferences file <filename>/etc/apt/preferences</filename> can be " +"used to control which versions of packages will be selected for installation." +msgstr "" +"Le fichier d'APT, <filename>/etc/apt/preferences</filename>, peut être " +"utilisé pour choisir la version des paquets que l'on veut installer." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:37 +#, fuzzy +msgid "" +"Several versions of a package may be available for installation when the " +"&sources-list; file contains references to more than one distribution (for " +"example, <literal>stable</literal> and <literal>testing</literal>). APT " +"assigns a priority to each version that is available. Subject to dependency " +"constraints, <command>apt-get</command> selects the version with the highest " +"priority for installation. The APT preferences file overrides the " +"priorities that APT assigns to package versions by default, thus giving the " +"user control over which one is selected for installation." +msgstr "" +"Quand le fichier &sources-list; contient des références à plusieurs " +"distributions (par exemple, <literal>stable</literal> et <literal>testing</" +"literal>), plusieurs versions d'un paquet peuvent être installées. APT " +"affecte une priorité à chaque version disponible. La commande <command>apt-" +"get</command>, tenant compte des contraintes de dépendance, installe la " +"version qui possède la priorité la plus haute. Le fichier des préférences " +"annule les priorités assignées par défaut aux versions des paquets : " +"ainsi l'utilisateur peut choisir la version qu'il veut installer." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:47 +#, fuzzy +msgid "" +"Several instances of the same version of a package may be available when the " +"&sources-list; file contains references to more than one source. In this " +"case <command>apt-get</command> downloads the instance listed earliest in " +"the &sources-list; file. The APT preferences file does not affect the " +"choice of instance, only the choice of version." +msgstr "" +"Si le fichier &sources-list; contient, pour une même distribution, des " +"références à plusieurs sites de téléchargement, il peut exister plusieurs " +"exemplaires de la même version d'un paquet. Dans ce cas, <command>apt-get</" +"command> télécharge l'exemplaire qui apparaît en premier dans le fichier " +"&sources-list;. Le fichier des préférences n'influe pas sur le choix des " +"exemplaires, seulement sur le choix de la version." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:54 +#, fuzzy +msgid "APT's Default Priority Assignments" +msgstr "Les priorités affectées par défaut" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:69 +#, fuzzy, no-wrap +msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" +msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:72 +#, fuzzy, no-wrap +msgid "APT::Default-Release \"stable\";\n" +msgstr "APT::Default-Release \"stable\";\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:56 +#, fuzzy +msgid "" +"If there is no preferences file or if there is no entry in the file that " +"applies to a particular version then the priority assigned to that version " +"is the priority of the distribution to which that version belongs. It is " +"possible to single out a distribution, \"the target release\", which " +"receives a higher priority than other distributions do by default. The " +"target release can be set on the <command>apt-get</command> command line or " +"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note " +"that this has precedence over any general priority you set in the <filename>/" +"etc/apt/preferences</filename> file described later, but not over " +"specifically pinned packages. For example, <placeholder type=" +"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" +msgstr "" +"Quand le fichier des préférences n'existe pas, ou quand aucune entrée de ce " +"fichier ne s'applique à une version précise, la priorité affectée à cette " +"version est la priorité de la distribution à laquelle elle appartient. On " +"peut distinguer une distribution et lui donner une priorité plus haute que " +"celle des autres distributions : on l'appelle la distribution par " +"défaut ou « target release » et elle peut être définie sur la ligne " +"de commande de <command>apt-get</command> ou dans le fichier de " +"configuration d'APT, <filename>/etc/apt/apt.conf</filename>. Par " +"exemple : <placeholder type=\"programlisting\" id=\"0\"/> <placeholder " +"type=\"programlisting\" id=\"1\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:81 +#, fuzzy +msgid "priority 100" +msgstr "une priorité égale à 100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:82 +#, fuzzy +msgid "to the version that is already installed (if any)." +msgstr "est affectée à la version déjà installée (si elle existe)." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:86 +#, fuzzy +msgid "priority 500" +msgstr "une priorité égale à 500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:87 +#, fuzzy +msgid "" +"to the versions that are not installed and do not belong to the target " +"release." +msgstr "" +"est affectée aux versions qui ne sont pas installées et qui n'appartiennent " +"pas à la distribution par défaut." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:91 +#, fuzzy +msgid "priority 990" +msgstr "une priorité égale à 990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:92 +#, fuzzy +msgid "to the versions that are not installed and belong to the target release." +msgstr "" +"est affectée aux versions qui ne sont pas installées et qui appartiennent à " +"la distribution par défaut." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:76 +#, fuzzy +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Quand une distribution par défaut a été indiquée, APT utilise l'algorithme " +"suivant pour déterminer la priorité des versions d'un paquet : " +"<placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:97 +#, fuzzy +msgid "" +"If the target release has not been specified then APT simply assigns " +"priority 100 to all installed package versions and priority 500 to all " +"uninstalled package versions." +msgstr "" +"Quand aucune distribution par défaut n'a été indiquée, APT affecte " +"simplement une priorité égale à 100 à toute version installée d'un paquet et " +"une priorité égale à 500 à tout version non installée." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:101 +#, fuzzy +msgid "" +"APT then applies the following rules, listed in order of precedence, to " +"determine which version of a package to install." +msgstr "" +"Puis APT applique les règles suivantes pour déterminer la version du paquet " +"qu'il faut installer (elles sont listées par ordre de priorité) :" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:104 +#, fuzzy +msgid "" +"Never downgrade unless the priority of an available version exceeds 1000. " +"(\"Downgrading\" is installing a less recent version of a package in place " +"of a more recent version. Note that none of APT's default priorities " +"exceeds 1000; such high priorities can only be set in the preferences file. " +"Note also that downgrading a package can be risky.)" +msgstr "" +"Ne jamais revenir en arrière, sauf si la priorité d'une version disponible " +"dépasse 1000. « Revenir en arrière » signifie installer une version " +"moins récente que la version installée. Il faut noter qu'aucune des " +"priorités par défaut n'excède 1000 ; de telles valeurs ne peuvent être " +"définies que dans le fichier des préférences. Notez aussi qu'il est risqué " +"de revenir en arrière." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:110 +#, fuzzy +msgid "Install the highest priority version." +msgstr "Installer la version qui possède la priorité la plus haute." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:111 +#, fuzzy +msgid "" +"If two or more versions have the same priority, install the most recent one " +"(that is, the one with the higher version number)." +msgstr "" +"Quand deux (ou plus) versions ont la même priorité, installer la version la " +"plus récente (c.-à-d. celle dont le numéro de version est le plus grand)." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:114 +#, fuzzy +msgid "" +"If two or more versions have the same priority and version number but either " +"the packages differ in some of their metadata or the <literal>--reinstall</" +"literal> option is given, install the uninstalled one." +msgstr "" +"Quand deux (ou plus) versions ont la même priorité et le même numéro de " +"version, mais soit les paquets diffèrent par certaines métadonnées, soit " +"l'option <literal>--reinstall</literal> a été donnée, installer la version " +"qui n'est pas installée." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:120 +#, fuzzy +msgid "" +"In a typical situation, the installed version of a package (priority 100) " +"is not as recent as one of the versions available from the sources listed in " +"the &sources-list; file (priority 500 or 990). Then the package will be " +"upgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"En général, la version installée d'un paquet (priorité 100) n'est pas aussi " +"récente que les versions disponibles dans les sources listées dans le " +"fichier &sources-list; (priorité 500 ou 990). Et donc le paquet sera mis à " +"niveau avec la commande : <command>apt-get install <replaceable>paquet</" +"replaceable></command> ou <command>apt-get dist-upgrade</command>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:127 +#, fuzzy +msgid "" +"More rarely, the installed version of a package is <emphasis>more</emphasis> " +"recent than any of the other available versions. The package will not be " +"downgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"La version installée d'un paquet peut être - rarement - <emphasis>plus</" +"emphasis> récente que tout autre version disponible. Les commandes " +"<command>apt-get install <replaceable>paquet</replaceable></command> ou " +"<command>apt-get upgrade</command> ne provoquent pas de retour en arrière." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:132 +#, fuzzy +msgid "" +"Sometimes the installed version of a package is more recent than the version " +"belonging to the target release, but not as recent as a version belonging to " +"some other distribution. Such a package will indeed be upgraded when " +"<command>apt-get install <replaceable>some-package</replaceable></command> " +"or <command>apt-get upgrade</command> is executed, because at least " +"<emphasis>one</emphasis> of the available versions has a higher priority " +"than the installed version." +msgstr "" +"Parfois, la version installée d'un paquet est plus récente que la version " +"appartenant à la distribution par défaut, mais moins récente que la version " +"appartenant à une autre distribution. Une telle version sera mise à niveau " +"par les commandes <command>apt-get install <replaceable>paquet</" +"replaceable></command> ou <command>apt-get upgrade</command> car au moins " +"<emphasis>l'une</emphasis> des versions disponibles possède une plus haute " +"priorité que celle de la version installée." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:141 +#, fuzzy +msgid "The Effect of APT Preferences" +msgstr "Conséquences des préférences" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:143 +#, fuzzy +msgid "" +"The APT preferences file allows the system administrator to control the " +"assignment of priorities. The file consists of one or more multi-line " +"records separated by blank lines. Records can have one of two forms, a " +"specific form and a general form." +msgstr "" +"Le fichier des préférences permet à l'administrateur système de contrôler " +"l'affectation des priorités. Ce fichier est constitué d'une ou plusieurs " +"entrées séparées par des lignes blanches. Ces entrées peuvent avoir deux " +"formes, une forme particulière et une forme générale." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:149 +#, fuzzy +msgid "" +"The specific form assigns a priority (a \"Pin-Priority\") to one or more " +"specified packages and specified version or version range. For example, the " +"following record assigns a high priority to all versions of the " +"<filename>perl</filename> package whose version number begins with " +"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." +msgstr "" +"La forme particulière affecte une priorité (<emphasis>Pin-Priority</" +"emphasis>) à un paquet précis, à une version précise ou à un intervalle " +"spécifiant plusieurs versions. Par exemple, l'entrée suivante affecte une " +"priorité haute à toutes les versions du paquet <filename>perl</filename> " +"dont le numéro de version commence par <literal>5.8</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:156 +#, fuzzy, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:162 +#, fuzzy +msgid "" +"The general form assigns a priority to all of the package versions in a " +"given distribution (that is, to all the versions of packages that are listed " +"in a certain <filename>Release</filename> file) or to all of the package " +"versions coming from a particular Internet site, as identified by the site's " +"fully qualified domain name." +msgstr "" +"La forme générale affecte une priorité à toutes les versions d'un paquet " +"dans une distribution donnée (c'est-à-dire, à toutes les versions d'un " +"paquet qui sont listées dans un fichier <filename>Release</filename>), ou à " +"toutes les versions d'un paquet provenant d'un site internet identifié par " +"un nom complètement qualifié." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:168 +#, fuzzy +msgid "" +"This general-form entry in the APT preferences file applies only to groups " +"of packages. For example, the following record assigns a high priority to " +"all package versions available from the local site." +msgstr "" +"Cette forme générale des entrées du fichier des préférences s'applique " +"seulement aux groupes de paquets. Par exemple, l'entrée suivante affecte une " +"priorité haute à toutes les versions disponibles dans le site local." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:173 +#, fuzzy, no-wrap +msgid "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +msgstr "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:178 +#, fuzzy +msgid "" +"A note of caution: the keyword used here is \"<literal>origin</literal>\". " +"This should not be confused with the Origin of a distribution as specified " +"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in " +"a <filename>Release</filename> file is not an Internet address but an author " +"or vendor name, such as \"Debian\" or \"Ximian\"." +msgstr "" +"Attention ! le mot-clé utilisé ici, <literal>origin</literal>, ne doit pas " +"être confondu avec l'Origine d'une distribution indiquée dans un fichier " +"<filename>Release</filename>. Ce qui suit l'étiquette « Origin: » " +"dans un fichier <filename>Release</filename> n'est pas une adresse internet " +"mais le nom d'un auteur ou d'un distributeur, comme Debian ou Ximian." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:184 +#, fuzzy +msgid "" +"The following record assigns a low priority to all package versions " +"belonging to any distribution whose Archive name is \"<literal>unstable</" +"literal>\"." +msgstr "" +"L'entrée suivante affecte une priorité basse à toutes les versions d'un " +"paquet appartenant à toute distribution dont le nom d'« Archive » " +"est <literal>unstable</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:188 +#, fuzzy, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:193 +#, fuzzy +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any distribution whose Codename is \"<literal>squeeze</literal>" +"\"." +msgstr "" +"L'entrée suivante affecte une priorité basse à toutes les versions d'un " +"paquet appartenant à toute distribution dont le nom d'« Archive » " +"est <literal>unstable</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:197 +#, fuzzy, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:202 +#, fuzzy +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any release whose Archive name is \"<literal>stable</literal>\" " +"and whose release Version number is \"<literal>3.0</literal>\"." +msgstr "" +"L'entrée suivante affecte une priorité haute à toutes les versions d'un " +"paquet appartenant à toute distribution dont le nom d'« Archive » " +"est <literal>stable</literal> et dont le numéro de « Version » est " +"<literal>3.0</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:207 +#, fuzzy, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:218 +#, fuzzy +msgid "How APT Interprets Priorities" +msgstr "Comment APT interprète-t-il les priorités ?" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:226 +#, fuzzy +msgid "P > 1000" +msgstr "P > 1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:227 +#, fuzzy +msgid "" +"causes a version to be installed even if this constitutes a downgrade of the " +"package" +msgstr "" +"Cette priorité entraîne l'installation du paquet même s'il s'agit d'un " +"retour en arrière." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:231 +#, fuzzy +msgid "990 < P <=1000" +msgstr "990 < P <=1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:232 +#, fuzzy +msgid "" +"causes a version to be installed even if it does not come from the target " +"release, unless the installed version is more recent" +msgstr "" +"La version sera installée, même si elle n'appartient pas à la distribution " +"par défaut ; mais elle ne sera pas installée si la version installée " +"est plus récente." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:237 +#, fuzzy +msgid "500 < P <=990" +msgstr "500 < P <=990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:238 +#, fuzzy +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to the target release or the installed version is more recent" +msgstr "" +"La version sera installée, sauf s'il existe une version appartenant à la " +"distribution par défaut ou si la version installée est plus récente." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:243 +#, fuzzy +msgid "100 < P <=500" +msgstr "100 < P <=500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:244 +#, fuzzy +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to some other distribution or the installed version is more recent" +msgstr "" +"La version sera installée, sauf s'il existe une version appartenant à une " +"autre distribution ou si la version installée est plus récente." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:249 +#, fuzzy +msgid "0 < P <=100" +msgstr "0 < P <=100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:250 +#, fuzzy +msgid "" +"causes a version to be installed only if there is no installed version of " +"the package" +msgstr "La version sera installée si aucune version du paquet n'est installée." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:254 +#, fuzzy +msgid "P < 0" +msgstr "P < 0" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:255 +#, fuzzy +msgid "prevents the version from being installed" +msgstr "Cette priorité empêche l'installation de la version." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:221 +#, fuzzy +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking): " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Les priorités (P) indiquées dans le fichier des préférences doivent être des " +"entiers positifs ou négatifs. Ils sont interprétés à peu près comme " +"suit : <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:260 +#, fuzzy +msgid "" +"If any specific-form records match an available package version then the " +"first such record determines the priority of the package version. Failing " +"that, if any general-form records match an available package version then " +"the first such record determines the priority of the package version." +msgstr "" +"Si l'une des entrées de forme particulière correspond à la version " +"disponible d'un paquet, la première entrée trouvée détermine la priorité de " +"cette version. S'il n'en existe pas, et si l'une des entrées de forme " +"générale correspond à la version disponible d'un paquet, la première entrée " +"trouvée détermine la priorité." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:266 +#, fuzzy +msgid "" +"For example, suppose the APT preferences file contains the three records " +"presented earlier:" +msgstr "" +"Supposons par exemple que le fichier des préférences contienne les trois " +"entrées décrites ci-dessous :" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:270 +#, fuzzy, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:283 +#, fuzzy +msgid "Then:" +msgstr "Alors :" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:285 +#, fuzzy +msgid "" +"The most recent available version of the <literal>perl</literal> package " +"will be installed, so long as that version's version number begins with " +"\"<literal>5.8</literal>\". If <emphasis>any</emphasis> 5.8* version of " +"<literal>perl</literal> is available and the installed version is 5.9*, then " +"<literal>perl</literal> will be downgraded." +msgstr "" +"La version la plus récente du paquet <literal>perl</literal> sera installé " +"pour autant que son numéro de version commence par <literal>5.8</literal>. " +"Si l'<emphasis>une</emphasis> des versions 5.8* existe et si la version " +"installée est une version 5.9*, il y aura un retour en arrière." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:290 +#, fuzzy +msgid "" +"A version of any package other than <literal>perl</literal> that is " +"available from the local system has priority over other versions, even " +"versions belonging to the target release." +msgstr "" +"Les versions des paquets (autres que <literal>perl</literal>) disponibles " +"dans le site local ont priorité sur les autres versions, même celles " +"appartenant à la distribution par défaut." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:294 +#, fuzzy +msgid "" +"A version of a package whose origin is not the local system but some other " +"site listed in &sources-list; and which belongs to an <literal>unstable</" +"literal> distribution is only installed if it is selected for installation " +"and no version of the package is already installed." +msgstr "" +"La version d'un paquet dont l'origine n'est pas le site local mais un site " +"internet listé dans &sources-list; et qui appartient à une distribution " +"<literal>unstable</literal>, ne sera installée que si aucune version du " +"paquet n'est déjà installée." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:304 +#, fuzzy +msgid "Determination of Package Version and Distribution Properties" +msgstr "Détermination de la version des paquets et des propriétés des distributions" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:306 +#, fuzzy +msgid "" +"The locations listed in the &sources-list; file should provide " +"<filename>Packages</filename> and <filename>Release</filename> files to " +"describe the packages available at that location." +msgstr "" +"Chaque source listée dans le fichier &sources-list; doit fournir les " +"fichiers <filename>Packages</filename> et <filename>Release</filename> qui " +"décrivent les paquets disponibles à cet endroit." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:318 +#, fuzzy +msgid "the <literal>Package:</literal> line" +msgstr "La ligne <literal>Package:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:319 +#, fuzzy +msgid "gives the package name" +msgstr "donne le nom du paquet" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:322 apt_preferences.5.xml:372 +#, fuzzy +msgid "the <literal>Version:</literal> line" +msgstr "La ligne <literal>Version:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:323 +#, fuzzy +msgid "gives the version number for the named package" +msgstr "donne le numéro de version du paquet" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:310 +#, fuzzy +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/" +"<replaceable>component</replaceable>/<replaceable>arch</replaceable></" +"filename>: for example, <filename>.../dists/stable/main/binary-i386/" +"Packages</filename>. It consists of a series of multi-line records, one for " +"each package available in that directory. Only two lines in each record are " +"relevant for setting APT priorities: <placeholder type=\"variablelist\" id=" +"\"0\"/>" +msgstr "" +"Le fichier <filename>Packages</filename> se trouve normalement dans le " +"répertoire <filename>.../dists/<replaceable>dist-name</replaceable>/" +"<replaceable>component</replaceable>/<replaceable>arch</replaceable></" +"filename>, par exemple, <filename>.../dists/stable/main/binary-i386/" +"Packages</filename>. Il consiste en entrées composées de lignes, une pour " +"chaque paquet disponible dans le répertoire. Seules deux lignes des entrées " +"sont pertinentes pour la détermination des priorités : <placeholder " +"type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:339 +#, fuzzy +msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" +msgstr "La ligne <literal>Archive:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:340 +#, fuzzy +msgid "" +"names the archive to which all the packages in the directory tree belong. " +"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " +"that all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file are in a <literal>stable</literal> " +"archive. Specifying this value in the APT preferences file would require " +"the line:" +msgstr "" +"nomme l'archive à laquelle appartiennent tous les paquets situés dans les " +"répertoires. Par exemple, la ligne <literal>Archive: stable</literal> " +"indique que tous les paquets dans les répertoires situés sous le répertoire " +"parent du fichier <filename>Release</filename> appartiennent à l'archive " +"<literal>stable</literal>. Indiquer cette valeur dans le fichier des " +"préférences demanderait cette ligne :" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:350 +#, fuzzy, no-wrap +msgid "Pin: release a=stable\n" +msgstr "Pin: release a=stable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:356 +#, fuzzy +msgid "the <literal>Codename:</literal> line" +msgstr "La ligne <literal>Component:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:357 +#, fuzzy +msgid "" +"names the codename to which all the packages in the directory tree belong. " +"For example, the line \"Codename: squeeze\" specifies that all of the " +"packages in the directory tree below the parent of the <filename>Release</" +"filename> file belong to a version named <literal>squeeze</literal>. " +"Specifying this value in the APT preferences file would require the line:" +msgstr "" +"nomme l'archive à laquelle appartiennent tous les paquets situés dans les " +"répertoires. Par exemple, la ligne <literal>Archive: stable</literal> " +"indique que tous les paquets dans les répertoires situés sous le répertoire " +"parent du fichier <filename>Release</filename> appartiennent à l'archive " +"<literal>stable</literal>. Indiquer cette valeur dans le fichier des " +"préférences demanderait cette ligne :" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:366 +#, fuzzy, no-wrap +msgid "Pin: release n=squeeze\n" +msgstr "Pin: release a=stable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:373 +#, fuzzy +msgid "" +"names the release version. For example, the packages in the tree might " +"belong to Debian GNU/Linux release version 3.0. Note that there is normally " +"no version number for the <literal>testing</literal> and <literal>unstable</" +"literal> distributions because they have not been released yet. Specifying " +"this in the APT preferences file would require one of the following lines." +msgstr "" +"indique la version de la distribution. Par exemple, les paquets dans les " +"répertoires peuvent appartenir à la distribution Debian GNU/Linux version " +"3.0. Il n'y a pas de numéro de version pour les distributions " +"<literal>testing</literal> et <literal>unstable</literal> car elles n'ont " +"pas encore été publiées. Indiquer cette valeur dans le fichier des " +"préférences demanderait ces lignes :" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:382 +#, fuzzy, no-wrap +msgid "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" +msgstr "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:391 +#, fuzzy +msgid "the <literal>Component:</literal> line" +msgstr "La ligne <literal>Component:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:392 +#, fuzzy +msgid "" +"names the licensing component associated with the packages in the directory " +"tree of the <filename>Release</filename> file. For example, the line " +"\"Component: main\" specifies that all the packages in the directory tree " +"are from the <literal>main</literal> component, which entails that they are " +"licensed under terms listed in the Debian Free Software Guidelines. " +"Specifying this component in the APT preferences file would require the line:" +msgstr "" +"nomme un composant qui indique le type de licence associée aux paquets " +"situés dans les répertoires sous le fichier <filename>Release</filename>. " +"Par exemple, la ligne <literal>Component: main</literal> indique que tous " +"les exemplaires dans les répertoires appartiennent au composant " +"<literal>main</literal>, c'est-à-dire que leur licence est en accord avec " +"les Directives Debian pour le logiciel libre. Indiquer ce composant dans le " +"fichier des préférences demanderait cette ligne :" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:401 +#, fuzzy, no-wrap +msgid "Pin: release c=main\n" +msgstr "Pin: release c=main\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:407 +#, fuzzy +msgid "the <literal>Origin:</literal> line" +msgstr "La ligne <literal>Origin:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:408 +#, fuzzy +msgid "" +"names the originator of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this origin in the APT preferences file would require " +"the line:" +msgstr "" +"nomme l'origine des paquets situés dans les répertoires sous le fichier " +"<filename>Release</filename>. En général, c'est <literal>Debian</literal>. " +"Indiquer cette origine dans le fichier des préférences demanderait cette " +"ligne :" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:414 +#, fuzzy, no-wrap +msgid "Pin: release o=Debian\n" +msgstr "Pin: release o=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:420 +#, fuzzy +msgid "the <literal>Label:</literal> line" +msgstr "La ligne <literal>Label:</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:421 +#, fuzzy +msgid "" +"names the label of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this label in the APT preferences file would require " +"the line:" +msgstr "" +"indique un label pour les paquets qui se trouvent dans les répertoires sous " +"le fichier <filename>Release</filename>. En général, c'est <literal>Debian</" +"literal>. Indiquer cette origine dans le fichier des préférences demanderait " +"cette ligne :" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:427 +#, fuzzy, no-wrap +msgid "Pin: release l=Debian\n" +msgstr "Pin: release l=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:328 +#, fuzzy +msgid "" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or <filename>.../" +"dists/woody/Release</filename>. It consists of a single multi-line record " +"which applies to <emphasis>all</emphasis> of the packages in the directory " +"tree below its parent. Unlike the <filename>Packages</filename> file, " +"nearly all of the lines in a <filename>Release</filename> file are relevant " +"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Le fichier <filename>Release</filename> se trouve normalement dans le " +"répertoire <filename>.../dists/<replaceable>dist-name</replaceable></" +"filename>, par exemple, <filename>.../dists/stable/Release</filename>, ou " +"<filename>.../dists/woody/Release</filename>. Il consiste en une seule " +"entrée composée de plusieurs lignes qui s'applique à <emphasis>tous</" +"emphasis> les paquets situés dans les répertoires sous le répertoire parent. " +"Contrairement au fichier <filename>Packages</filename>, presque toutes les " +"lignes du fichier <filename>Release</filename> sont pertinentes pour " +"déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:434 +#, fuzzy +msgid "" +"All of the <filename>Packages</filename> and <filename>Release</filename> " +"files retrieved from locations listed in the &sources-list; file are stored " +"in the directory <filename>/var/lib/apt/lists</filename>, or in the file " +"named by the variable <literal>Dir::State::Lists</literal> in the " +"<filename>apt.conf</filename> file. For example, the file <filename>debian." +"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> " +"contains the <filename>Release</filename> file retrieved from the site " +"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> " +"architecture files from the <literal>contrib</literal> component of the " +"<literal>unstable</literal> distribution." +msgstr "" +"Tous les fichiers <filename>Packages</filename> et <filename>Release</" +"filename> récupérés dans des sources listées par le fichier &sources-list; " +"sont conservés dans le répertoire <filename>/var/lib/apt/lists</filename> ou " +"dans le fichier spécifié par la variable <literal>Dir::State::Lists</" +"literal> dans le fichier <filename>apt.conf</filename>. Par exemple, le " +"fichier <filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-" +"i386_Release</filename> contient le fichier <filename>Release</filename> du " +"site <literal>debian.lcs.mit.edu</literal>, architecture <literal>binary-" +"i386</literal> et composant <literal>contrib</literal> de la distribution " +"<literal>unstable</literal>." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:447 +#, fuzzy +msgid "Optional Lines in an APT Preferences Record" +msgstr "Lignes facultatives dans le fichier des préférences" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:449 +#, fuzzy +msgid "" +"Each record in the APT preferences file can optionally begin with one or " +"more lines beginning with the word <literal>Explanation:</literal>. This " +"provides a place for comments." +msgstr "" +"Toute entrée du fichier des préférences peut commencer par une ou plusieurs " +"lignes contenant le mot <literal>Explanation:</literal>. Cela permet des " +"commentaires." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:453 +#, fuzzy +msgid "" +"The <literal>Pin-Priority:</literal> line in each APT preferences record is " +"optional. If omitted, APT assigns a priority of 1 less than the last value " +"specified on a line beginning with <literal>Pin-Priority: release ...</" +"literal>." +msgstr "" +"La ligne <literal>Pin-Priority:</literal> d'une entrée est facultative. Si " +"elle n'existe pas, APT affecte une priorité inférieure de 1 à la valeur " +"spécifiée sur une ligne commençant par <literal>Pin-Priority: release ...</" +"literal>." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:462 +#, fuzzy +msgid "Tracking Stable" +msgstr "Comment suivre Stable ?" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:470 +#, fuzzy, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explanation: Ne pas installer des exemplaires d'origine Debian\n" +"Explanation: sauf ceux de la distribution stable\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:464 +#, fuzzy +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"<literal>stable</literal> distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> " +"distributions. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Le fichier des préférences suivant affecte une priorité plus haute que la " +"priorité par défaut (500) à tous les exemplaires appartenant à la " +"distribution <literal>stable</literal> et une priorité prohibitivement basse " +"à tous les exemplaires appartenant à d'autres distributions <literal>Debian</" +"literal>. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:487 apt_preferences.5.xml:533 +#: apt_preferences.5.xml:591 +#, fuzzy, no-wrap +msgid "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" +msgstr "" +"apt-get install <replaceable>paquet</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:482 +#, fuzzy +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Avec le fichier des préférences ci-dessus et un fichier &sources-list; " +"adéquat, les commandes suivantes utiliseront les versions les plus récentes " +"de <literal>stable</literal> pour faire la mise à niveau : <placeholder " +"type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:499 +#, fuzzy, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/testing\n" +msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:493 +#, fuzzy +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>testing</literal> distribution; the package " +"will not be upgraded again unless this command is given again. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"La commande suivante utilisera la version la plus récente de la distribution " +"<literal>testing</literal> pour mettre à niveau le paquet spécifié ; " +"cependant les mises à niveau ultérieures du paquet ne se feront pas à moins " +"de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:505 +#, fuzzy +msgid "Tracking Testing or Unstable" +msgstr "Comment suivre Testing ou Unstable ?" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:514 +#, fuzzy, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:507 +#, fuzzy +msgid "" +"The following APT preferences file will cause APT to assign a high priority " +"to package versions from the <literal>testing</literal> distribution, a " +"lower priority to package versions from the <literal>unstable</literal> " +"distribution, and a prohibitively low priority to package versions from " +"other <literal>Debian</literal> distributions. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"Le fichier des préférences suivant affecte une priorité haute aux versions " +"des paquets appartenant à la distribution <literal>testing</literal>, une " +"priorité moindre aux versions appartenant à la distribution " +"<literal>unstable</literal> et une priorité prohibitivement basse aux " +"versions appartenant à d'autres distributions <literal>Debian</literal>. " +"<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:528 +#, fuzzy +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Avec un fichier &sources-list; approprié et le fichier des préférences ci-" +"dessus, les commandes suivantes utiliseront les versions les plus récentes " +"de <literal>testing</literal> pour faire la mise à niveau : " +"<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:548 +#, fuzzy, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/unstable\n" +msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:539 +#, fuzzy +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>unstable</literal> distribution. " +"Thereafter, <command>apt-get upgrade</command> will upgrade the package to " +"the most recent <literal>testing</literal> version if that is more recent " +"than the installed version, otherwise, to the most recent <literal>unstable</" +"literal> version if that is more recent than the installed version. " +"<placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"La commande suivante utilisera la version la plus récente de la distribution " +"<literal>unstable</literal> pour mettre à niveau le paquet spécifié ; " +"Par la suite, <command>apt-get upgrade</command> mettra le paquet à jour " +"avec la plus récente version dans <literal>testing</literal> si elle est " +"plus récente que la version installée ou avec la plus récente version dans " +"<literal>unstable</literal> si elle est plus récente que la version " +"installée. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:555 +msgid "Tracking the evolution of a codename release" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:569 +#, fuzzy, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explanation: Ne pas installer des exemplaires d'origine Debian\n" +"Explanation: sauf ceux de la distribution stable\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:557 +#, fuzzy +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"specified codename of a distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> distributions, " +"codenames and archives. Note that with this APT preference APT will follow " +"the migration of a release from the archive <literal>testing</literal> to " +"<literal>stable</literal> and later <literal>oldstable</literal>. If you " +"want to follow for example the progress in <literal>testing</literal> " +"notwithstanding the codename changes you should use the example " +"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Le fichier des préférences suivant affecte une priorité plus haute que la " +"priorité par défaut (500) à tous les exemplaires appartenant à la " +"distribution <literal>stable</literal> et une priorité prohibitivement basse " +"à tous les exemplaires appartenant à d'autres distributions <literal>Debian</" +"literal>. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:586 +#, fuzzy +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest version(s) in " +"the release codenamed with <literal>squeeze</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"Avec le fichier des préférences ci-dessus et un fichier &sources-list; " +"adéquat, les commandes suivantes utiliseront les versions les plus récentes " +"de <literal>stable</literal> pour faire la mise à niveau : <placeholder " +"type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:606 +#, fuzzy, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/sid\n" +msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:597 +#, fuzzy +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>sid</literal> distribution. Thereafter, " +"<command>apt-get upgrade</command> will upgrade the package to the most " +"recent <literal>squeeze</literal> version if that is more recent than the " +"installed version, otherwise, to the most recent <literal>sid</literal> " +"version if that is more recent than the installed version. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"La commande suivante utilisera la version la plus récente de la distribution " +"<literal>unstable</literal> pour mettre à niveau le paquet spécifié ; " +"Par la suite, <command>apt-get upgrade</command> mettra le paquet à jour " +"avec la plus récente version dans <literal>testing</literal> si elle est " +"plus récente que la version installée ou avec la plus récente version dans " +"<literal>unstable</literal> si elle est plus récente que la version " +"installée. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:614 +#, fuzzy +msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" + +#. type: Content of: <refentry><refnamediv><refname> +#: sources.list.5.xml:22 sources.list.5.xml:28 +#, fuzzy +msgid "sources.list" +msgstr "sources.list" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: sources.list.5.xml:29 +#, fuzzy +msgid "Package resource list for APT" +msgstr "Liste des sources de paquets" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:33 +#, fuzzy +msgid "" +"The package resource list is used to locate archives of the package " +"distribution system in use on the system. At this time, this manual page " +"documents only the packaging system used by the Debian GNU/Linux system. " +"This control file is located in <filename>/etc/apt/sources.list</filename>" +msgstr "" +"La liste des sources de paquets indique où trouver les archives du système " +"de distribution de paquets utilisé. Pour l'instant, cette page de manuel ne " +"documente que le système d'empaquetage utilisé par le système Debian GNU/" +"Linux. Ce fichier de contrôle est <filename>/etc/apt/sources.list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:38 +#, fuzzy +msgid "" +"The source list is designed to support any number of active sources and a " +"variety of source media. The file lists one source per line, with the most " +"preferred source listed first. The format of each line is: <literal>type uri " +"args</literal> The first item, <literal>type</literal> determines the format " +"for <literal>args</literal> <literal>uri</literal> is a Universal Resource " +"Identifier (URI), which is a superset of the more specific and well-known " +"Universal Resource Locator, or URL. The rest of the line can be marked as a " +"comment by using a #." +msgstr "" +"La liste des sources est conçue pour prendre en compte un nombre quelconque " +"de sources actives et différents média. Le fichier présente une source par " +"ligne et la source préférée apparaît en premier. Le format de chaque ligne " +"est : <literal>type uri args</literal>. Le premier élément, " +"<literal>type</literal>, détermine le format des <literal>args</literal>. " +"<literal>uri</literal> est un identificateur universel de ressources (URI), " +"qui est un sur-ensemble du plus spécifique et bien connu repère universel de " +"ressources, ou URL. La fin de la ligne peut être un commentaire commençant " +"par un caractère #." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:49 +#, fuzzy +msgid "sources.list.d" +msgstr "sources.list.d" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:50 +#, fuzzy +msgid "" +"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " +"add sources.list entries in separate files. The format is the same as for " +"the regular <filename>sources.list</filename> file. File names need to end " +"with <filename>.list</filename> and may only contain letters (a-z and A-Z), " +"digits (0-9), underscore (_), hyphen (-) and period (.) characters. " +"Otherwise they will be silently ignored." +msgstr "" +"Le répertoire <filename>/etc/apt/sources.list.d</filename> permet de lister " +"des sources de paquets dans des fichiers distincts qui se terminent par " +"<literal>.list</literal>. Leur format est le même que celui du fichier " +"<filename>sources.list</filename>." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:59 +#, fuzzy +msgid "The deb and deb-src types" +msgstr "Les types deb et deb-src." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:60 +#, fuzzy +msgid "" +"The <literal>deb</literal> type describes a typical two-level Debian " +"archive, <filename>distribution/component</filename>. Typically, " +"<literal>distribution</literal> is generally one of <literal>stable</" +"literal> <literal>unstable</literal> or <literal>testing</literal> while " +"component is one of <literal>main</literal> <literal>contrib</literal> " +"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-" +"src</literal> type describes a debian distribution's source code in the same " +"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line " +"is required to fetch source indexes." +msgstr "" +"Le type <literal>deb</literal> décrit une archive Debian classique à deux " +"niveaux, <filename>distribution/composant</filename>. <literal>distribution</" +"literal> peut prendre l'une des valeurs suivantes : <literal>stable</" +"literal>, <literal>unstable</literal>, ou <literal>testing</literal>, et " +"composant : <literal>main</literal>, <literal>contrib</literal>, " +"<literal>non-free</literal>, ou <literal>non-us</literal>. Le type " +"<literal>deb-src</literal> décrit le code source pour une distribution " +"Debian dans le même format que le type <literal>deb</literal>. Une ligne " +"<literal>deb-src</literal> est nécessaire pour récupérer les index des " +"sources." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:72 +#, fuzzy +msgid "" +"The format for a <filename>sources.list</filename> entry using the " +"<literal>deb</literal> and <literal>deb-src</literal> types are:" +msgstr "" +"Le format d'une entrée dans <filename>sources.list</filename> utilisant les " +"types <literal>deb</literal> et <literal>deb-src</literal> est de la " +"forme :" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:75 +#, fuzzy, no-wrap +msgid "deb uri distribution [component1] [component2] [...]" +msgstr "deb uri distribution [composant1] [composant2] [...]" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:77 +#, fuzzy +msgid "" +"The URI for the <literal>deb</literal> type must specify the base of the " +"Debian distribution, from which APT will find the information it needs. " +"<literal>distribution</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>distribution</literal> must end with " +"a slash (/). This is useful for when only a particular sub-section of the " +"archive denoted by the URI is of interest. If <literal>distribution</" +"literal> does not specify an exact path, at least one <literal>component</" +"literal> must be present." +msgstr "" +"L'URI de type <literal>deb</literal> doit indiquer la base de la " +"distribution Debian dans laquelle APT trouvera les informations dont il a " +"besoin. <literal>distribution</literal> peut spécifier le chemin " +"exact : dans ce cas, on doit omettre les composants et " +"<literal>distribution</literal> doit se terminer par une barre oblique (/). " +"C'est utile quand seule une sous-section particulière de l'archive décrite " +"par cet URI est intéressante. Quand <literal>distribution</literal> " +"n'indique pas un chemin exact, un <literal>composant</literal> au moins doit " +"être présent." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:86 +#, fuzzy +msgid "" +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (i386, m68k, " +"powerpc, ...) used on the system. This permits architecture-independent " +"<filename>sources.list</filename> files to be used. In general this is only " +"of interest when specifying an exact path, <literal>APT</literal> will " +"automatically generate a URI with the current architecture otherwise." +msgstr "" +"<literal>distribution</literal> peut aussi contenir une variable <literal>" +"$(ARCH)</literal>, qui sera remplacée par l'architecture Debian (i386, m68k, " +"powerpc, ...) sur laquelle s'exécute le système. On peut ainsi utiliser un " +"fichier <filename>sources.list</filename> qui ne dépend pas d'une " +"architecture. En général, ce n'est intéressant que si l'on indique un chemin " +"exact ; sinon <literal>APT</literal> crée automatiquement un URI en " +"fonction de l'architecture effective." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:94 +#, fuzzy +msgid "" +"Since only one distribution can be specified per line it may be necessary to " +"have multiple lines for the same URI, if a subset of all available " +"distributions or components at that location is desired. APT will sort the " +"URI list after it has generated a complete set internally, and will collapse " +"multiple references to the same Internet host, for instance, into a single " +"connection, so that it does not inefficiently establish an FTP connection, " +"close it, do something else, and then re-establish a connection to that same " +"host. This feature is useful for accessing busy FTP sites with limits on the " +"number of simultaneous anonymous users. APT also parallelizes connections to " +"different hosts to more effectively deal with sites with low bandwidth." +msgstr "" +"Puisqu'on ne peut indiquer qu'une seule distribution par ligne, il peut être " +"nécessaire de disposer le même URI sur plusieurs lignes quand on veut " +"accéder à un sous-ensemble des distributions ou composants disponibles à " +"cette adresse. APT trie les URI après avoir crée pour lui-même la liste " +"complète ; il regroupe les références multiples au même hôte Internet " +"en vue d'une connexion unique et il évite ainsi, par exemple, d'établir une " +"connexion FTP, de la fermer, faire autre chose, puis d'établir encore cette " +"connexion. Cette fonctionnalité permet l'accès à des sites FTP surchargés " +"qui limitent le nombre de connexions simultanées pour les utilisateurs " +"anonymes. APT parallélise aussi les connexions à différents hôtes pour " +"tirer plus efficacement parti des sites à faible bande passante." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:106 +#, fuzzy +msgid "" +"It is important to list sources in order of preference, with the most " +"preferred source listed first. Typically this will result in sorting by " +"speed from fastest to slowest (CD-ROM followed by hosts on a local network, " +"followed by distant Internet hosts, for example)." +msgstr "" +"Il est important d'indiquer les sources par ordre de préférence, la source " +"principale apparaissant en premier. Un tri est fait, de la plus rapide à la " +"plus lente ; par exemple, un cédérom suivi par les hôtes d'un réseau " +"local, puis les hôtes distants." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:111 +#, fuzzy +msgid "Some examples:" +msgstr "Voici quelques exemples :" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:113 +#, fuzzy, no-wrap +msgid "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " +msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:119 +#, fuzzy +msgid "URI specification" +msgstr "La spécification des URI" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:124 +#, fuzzy +msgid "file" +msgstr "file" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:126 +#, fuzzy +msgid "" +"The file scheme allows an arbitrary directory in the file system to be " +"considered an archive. This is useful for NFS mounts and local mirrors or " +"archives." +msgstr "" +"Le procédé <literal>file</literal> permet qu'un répertoire arbitraire au " +"sein du système de fichier soit considéré comme une archive. On s'en sert " +"avec les montages NFS, les miroirs et les archives locaux." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:133 +#, fuzzy +msgid "" +"The cdrom scheme allows APT to use a local CDROM drive with media swapping. " +"Use the &apt-cdrom; program to create cdrom entries in the source list." +msgstr "" +"Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de " +"cédérom avec la possibilité de changer de media. Utilisez le programme &apt-" +"cdrom; pour créer des entrées dans la liste des sources." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:140 +#, fuzzy +msgid "" +"The http scheme specifies an HTTP server for the archive. If an environment " +"variable <envar>http_proxy</envar> is set with the format http://server:" +"port/, the proxy server specified in <envar>http_proxy</envar> will be used. " +"Users of authenticated HTTP/1.1 proxies may use a string of the format " +"http://user:pass@server:port/ Note that this is an insecure method of " +"authentication." +msgstr "" +"Le procédé <literal>http</literal> indique un serveur HTTP comme archive. Si " +"une variable d'environnement <envar>http_proxy</envar> (au format http://" +"server:port/) existe, le serveur mandataire indiqué par <envar>http_proxy</" +"envar> est utilisé. Quand un serveur mandataire HTTP/1.1 demande une " +"authentification, on peut utiliser la chaîne http://user:pass@server:port/. " +"Notez qu'il s'agit d'une méthode d'authentification peu sûre." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:151 +#, fuzzy +msgid "" +"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " +"is highly configurable; for more information see the &apt-conf; manual page. " +"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</" +"envar> environment variable. It is possible to specify a http proxy (http " +"proxy servers often understand ftp urls) using this method and ONLY this " +"method. ftp proxies using http specified in the configuration file will be " +"ignored." +msgstr "" +"Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. Le " +"fonctionnement en mode ftp est largement configurable ; référez-vous à " +"la page de manuel de &apt-cdrom; pour d'autres informations. On remarquera " +"qu'on peut indiquer un mandataire ftp avec la variable d'environnement " +"<envar>ftp_proxy</envar>. On peut aussi spécifier un mandataire http (les " +"serveurs mandataires http comprennent souvent les URL ftp) en utilisant " +"cette méthode et SEULEMENT cette méthode. Les mandataires ftp utilisant http " +"et qui sont spécifiés dans le fichier de configuration seront ignorés." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:160 +msgid "copy" +msgstr "copy" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:162 +msgid "" +"The copy scheme is identical to the file scheme except that packages are " +"copied into the cache directory instead of used directly at their location. " +"This is useful for people using a zip disk to copy files around with APT." +msgstr "" +"Le procédé <literal>copy</literal> est identique au procédé <literal>file</" +"literal> excepté que les paquets sont copiés dans le cache du répertoire au " +"lieu d'être utilisés directement depuis leur emplacement. C'est utile aux " +"gens qui utilisent un disque zip pour recopier des fichiers avec APT." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:167 +msgid "rsh" +msgstr "rsh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:167 +msgid "ssh" +msgstr "ssh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:169 +msgid "" +"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " +"user and access the files. It is a good idea to do prior arrangements with " +"RSA keys or rhosts. Access to files on the remote uses standard " +"<command>find</command> and <command>dd</command> commands to perform the " +"file transfers from the remote." +msgstr "" +"Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante " +"en tant qu'un certain utilisateur et pour accéder aux fichiers. " +"Il est préférable au préalable de s'arranger " +"avec des clés RSA ou bien rhosts. Pour l'accès aux " +"fichiers de la machine distante et le transfert, on utilise les commandes " +"standard <command>find</command> et <command>dd</command>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:121 +msgid "" +"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " +"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Les types d'URI actuellement reconnus sont : cdrom, file, http, ftp, copy, ssh et rsh. " +"<placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:181 +msgid "" +"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " +"stable/main, stable/contrib, and stable/non-free." +msgstr "" +"Utiliser l'archive stockée localement (ou montée via NFS) dans /home/jason/" +"debian pour stable/main, stable/contrib et stable/non-free." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:183 +#, no-wrap +msgid "deb file:/home/jason/debian stable main contrib non-free" +msgstr "deb file:/home/jason/debian stable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:185 +msgid "As above, except this uses the unstable (development) distribution." +msgstr "" +"Comme ci-dessus, excepté que cette ligne utilise la distribution « " +"unstable » (développement)." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:186 +#, no-wrap +msgid "deb file:/home/jason/debian unstable main contrib non-free" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:188 +msgid "Source line for the above" +msgstr "La précédente ligne, mais pour les sources." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:189 +#, no-wrap +msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:191 +msgid "" +"Uses HTTP to access the archive at archive.debian.org, and uses only the " +"hamm/main area." +msgstr "" +"Utiliser HTTP pour accéder à l'archive située à archive.debian.org, et " +"n'utiliser que la section hamm/main." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:193 +#, no-wrap +msgid "deb http://archive.debian.org/debian-archive hamm main" +msgstr "deb http://archive.debian.org/debian-archive hamm main" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:195 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the stable/contrib area." +msgstr "" +"Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le " +"répertoire debian, et n'utiliser que la section stable/contrib." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:197 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:199 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the unstable/contrib area. If this line appears as " +"well as the one in the previous example in <filename>sources.list</" +"filename>. a single FTP session will be used for both resource lines." +msgstr "" +"Utiliser FTP pour accéder à l'archive située à ftp.debian.org, dans le " +"répertoire debian, et n'utiliser que la section unstable/contrib. Si cette " +"ligne et celle de l'exemple précédent dans <filename>sources.list</filename> " +"apparaissent, une seule session FTP sera utilisée pour les deux lignes." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:203 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:205 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory." +msgstr "" +"Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le " +"répertoire debian-non-US." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:207 +#, no-wrap +msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:216 +#, no-wrap +msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:209 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory, and uses only files found under <filename>unstable/binary-i386</" +"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on " +"m68k, and so forth for other supported architectures. [Note this example " +"only illustrates how to use the substitution variable; non-us is no longer " +"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le " +"répertoire debian-non-US, et n'utiliser que les fichiers trouvés dans " +"<filename>unstable/binary-i386</filename> pour les machines i386, dans " +"<filename>unstable/binary-m68k</filename> pour les machines m68k et ainsi de " +"suite pour les autres architectures reconnues. [Notez que cet exemple montre " +"seulement la manière d'utiliser la variable à substituer, non-us n'étant " +"plus structuré de cette manière.] <placeholder type=\"literallayout\" id=\"0" +"\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:221 +msgid "&apt-cache; &apt-conf;" +msgstr "&apt-cache; &apt-conf;" + +#, fuzzy +#~ msgid "" +#~ "Source packages are tracked separately from binary packages via " +#~ "<literal>deb-src</literal> type lines in the &sources-list; file. This " +#~ "means that you will need to add such a line for each repository you want " +#~ "to get sources from. If you don't do this you will properly get another " +#~ "(newer, older or none) source version than the one you have installed or " +#~ "could install." +#~ msgstr "" +#~ "Les paquets source sont gérés indépendamment des paquets binaires, via " +#~ "les lignes de type <literal>deb-src</literal> dans le fichier &sources-" +#~ "list;. On n'obtiendra probablement pas les mêmes sources que celles du " +#~ "paquet installé ou celles du paquet qu'on pourrait installer." + +#, fuzzy +#~ msgid "" +#~ "If the <option>--compile</option> options is specified then the package " +#~ "will be compiled to a binary .deb using <command>dpkg-buildpackage</" +#~ "command>, if <option>--download-only</option> is specified then the " +#~ "source package will not be unpacked." +#~ msgstr "" +#~ "Si l'option <option>--compile</option> est spécifiée, le paquet est " +#~ "compilé en un binaire .deb avec <command>dpkg-buildpackage</command>. Si " +#~ "<option>--download-only</option> est spécifié, le source n'est pas " +#~ "décompacté." -- cgit v1.2.3-70-g09d2 From 1f99b6d338186efe80e314268db44600d3c94a1e Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 8 Sep 2009 09:47:12 +0200 Subject: replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) instead of ignoring the returncode and truncating the string on error --- apt-pkg/contrib/strutl.cc | 15 +++++++++++++-- debian/changelog | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 1683868c8..4c05f2df8 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -67,9 +67,20 @@ bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest) outbuf = new char[insize+1]; outptr = outbuf; - iconv(cd, &inptr, &insize, &outptr, &outsize); - *outptr = '\0'; + while (insize != 0) + { + size_t const err = iconv(cd, &inptr, &insize, &outptr, &outsize); + if (err == (size_t)(-1)) + { + insize--; + outsize++; + inptr++; + *outptr = '?'; + outptr++; + } + } + *outptr = '\0'; *dest = outbuf; delete[] outbuf; diff --git a/debian/changelog b/debian/changelog index 349c95038..34691b1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.24) UNRELEASED; urgency=low - simplify the makefiles needed for po4a manpages * apt-pkg/contrib/configuration.cc: - add a helper to easily get a vector of strings from the config + * apt-pkg/contrib/strutl.cc: + - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 6da747804c63f103f431706af80f793b86c41993 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 8 Sep 2009 14:27:17 +0200 Subject: doc/apt-get.8.xml: fix two little typos in the --simulate description. (half-closes #545059) --- debian/changelog | 2 ++ doc/apt-get.8.xml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 34691b1fb..3d8dc292a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add a helper to easily get a vector of strings from the config * apt-pkg/contrib/strutl.cc: - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) + * doc/apt-get.8.xml: + - fix two little typos in the --simulate description. -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index b87e17247..3a1292198 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -384,9 +384,9 @@ Configuration Item: <literal>APT::Get::Simulate</literal>.</para> <para>Simulation run as user will deactivate locking (<literal>Debug::NoLocking</literal>) - automatical. Also a notice will be displayed indicating that this is only a simulation, - if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true) - Neigther NoLocking nor the notice will be triggered if run as root (root should know what + automatic. Also a notice will be displayed indicating that this is only a simulation, + if the option <literal>APT::Get::Show-User-Simulation-Note</literal> is set (Default: true). + Neither NoLocking nor the notice will be triggered if run as root (root should know what he is doing without further warnings by <literal>apt-get</literal>).</para> <para>Simulate prints out -- cgit v1.2.3-70-g09d2 From 8bd02d8bd6bc46bc38924635afc09fdde50b6bf5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 8 Sep 2009 15:02:15 +0200 Subject: Rework the CompressionTypes system by adding an Order subgroup to simplify customisation of the order and improve the documentation about this setting group. --- apt-pkg/aptconfiguration.cc | 56 +++++++++++++++++++++++++++----------------- debian/changelog | 3 +++ doc/apt.conf.5.xml | 32 ++++++++++++++++++------- doc/examples/configure-index | 9 +++++++ 4 files changed, 69 insertions(+), 31 deletions(-) (limited to 'debian') diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 1a8e8262f..45ae9bed5 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -14,6 +14,7 @@ #include <vector> #include <string> +#include <algorithm> /*}}}*/ namespace APT { // getCompressionTypes - Return Vector of usbale compressiontypes /*{{{*/ @@ -29,41 +30,52 @@ const Configuration::getCompressionTypes(bool const &Cached) { types.clear(); } + // setup the defaults for the compressiontypes => method mapping + _config->CndSet("Acquire::CompressionTypes::bz2","bzip2"); + _config->CndSet("Acquire::CompressionTypes::lzma","lzma"); + _config->CndSet("Acquire::CompressionTypes::gz","gzip"); + // Set default application paths to check for optional compression types _config->CndSet("Dir::Bin::lzma", "/usr/bin/lzma"); _config->CndSet("Dir::Bin::bzip2", "/bin/bzip2"); - ::Configuration::Item const *Opts = _config->Tree("Acquire::CompressionTypes"); - if (Opts != 0) - Opts = Opts->Child; + // accept non-list order as override setting for config settings on commandline + std::string const overrideOrder = _config->Find("Acquire::CompressionTypes::Order",""); + if (overrideOrder.empty() == false) + types.push_back(overrideOrder); - // at first, move over the options to setup at least the default options - bool foundLzma=false, foundBzip2=false, foundGzip=false; - for (; Opts != 0; Opts = Opts->Next) { - if (Opts->Value == "lzma") - foundLzma = true; - else if (Opts->Value == "bz2") - foundBzip2 = true; - else if (Opts->Value == "gz") - foundGzip = true; + // load the order setting into our vector + std::vector<std::string> const order = _config->FindVector("Acquire::CompressionTypes::Order"); + for (std::vector<std::string>::const_iterator o = order.begin(); + o != order.end(); o++) { + if ((*o).empty() == true) + continue; + // ignore types we have no method ready to use + if (_config->Exists(string("Acquire::CompressionTypes::").append(*o)) == false) + continue; + // ignore types we have no app ready to use + string const appsetting = 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; + } + types.push_back(*o); } - // setup the defaults now - if (!foundBzip2) - _config->Set("Acquire::CompressionTypes::bz2","bzip2"); - if (!foundLzma) - _config->Set("Acquire::CompressionTypes::lzma","lzma"); - if (!foundGzip) - _config->Set("Acquire::CompressionTypes::gz","gzip"); - - // move again over the option tree to finially calculate our result + // move again over the option tree to add all missing compression types ::Configuration::Item const *Types = _config->Tree("Acquire::CompressionTypes"); if (Types != 0) Types = Types->Child; for (; Types != 0; Types = Types->Next) { + if (Types->Tag == "Order" || Types->Tag.empty() == true) + continue; + // ignore types we already have in the vector + if (std::find(types.begin(),types.end(),Types->Tag) != types.end()) + continue; + // ignore types we have no app ready to use string const appsetting = string("Dir::Bin::").append(Types->Value); - // ignore compression types we have no app ready to use if (appsetting.empty() == false && _config->Exists(appsetting) == true) { std::string const app = _config->FindFile(appsetting.c_str(), ""); if (app.empty() == false && FileExists(app) == false) diff --git a/debian/changelog b/debian/changelog index 3d8dc292a..5ddd84117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.24) UNRELEASED; urgency=low - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) * doc/apt-get.8.xml: - fix two little typos in the --simulate description. + * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: + - add an order subgroup to the compression types to simplify reordering + a bit and improve the documentation for this option group. -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e0ce0db40..92ac5ec04 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -90,7 +90,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <literal>#include</literal> will include the given file, unless the filename ends in a slash, then the whole directory is included. <literal>#clear</literal> is used to erase a part of the configuration tree. The - specified element and all its descendents are erased.</para> + specified element and all its descendants are erased.</para> <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 @@ -312,16 +312,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <varlistentry><term>CompressionTypes</term> <listitem><para>List of compression types which are understood by the acquire methods. Files like <filename>Packages</filename> can be available in various compression formats. - This list defines in which order the acquire methods will try to download these files. - Per default <command>bzip2</command> compressed files will be prefered over - <command>lzma</command>, <command>gzip</command> and uncompressed files. The syntax for - the configuration fileentry is + Per default the acquire methods can decompress <command>bzip2</command>, <command>lzma</command> + and <command>gzip</command> compressed files, with this setting more formats can be added + on the fly or the used method can be changed. The syntax for this is: <synopsis>Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "<replaceable>Methodname</replaceable>";</synopsis> - e.g. <synopsis>Acquire::CompressionTypes::bz2 "bzip2";</synopsis> - Note that at runtime the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will + </para><para>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 acquire system will try the first + and proceed with the next compression type in this list on error, so to prefer one over the other type + simple add the preferred type at first - not already added default types will be added at run time + to the end of the list, so e.g. <synopsis>Acquire::CompressionTypes::Order:: "gz";</synopsis> can + be used to prefer <command>gzip</command> compressed files over <command>bzip2</command> and <command>lzma</command>. + If <command>lzma</command> should be preferred over <command>gzip</command> and <command>bzip2</command> the + configure setting should look like this <synopsis>Acquire::CompressionTypes::Order { "lzma"; "gz"; };</synopsis> + It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para> + <para>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 above (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> - </para></listitem> + the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout> + Note also that list entries specified on the commandline 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 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.</para> + <para>While it is possible to add an empty compression type to the order list, but APT in its current + version doesn't understand it correctly and will display many warnings about not downloaded files - + these warnings are most of the time false negatives. Future versions will maybe include a way to + really prefer uncompressed files to support the usage of local mirrors.</para></listitem> </varlistentry> </variablelist> </para> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 5dc7b5246..8025fa4b4 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -246,6 +246,15 @@ Acquire { Options {"--ignore-time-conflict";} // not very useful on a normal system }; + + CompressionTypes + { + bz2 "bzip2"; + lzma "lzma"; + gz "gzip"; + + Order { "gz"; "lzma"; "bz2"; }; + }; }; // Directory layout -- cgit v1.2.3-70-g09d2 From 1221c3a38f9962ea7ac866eb507fdd798481b5d4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 8 Sep 2009 17:43:47 +0200 Subject: doc/apt.ent: move the description of files to globally usable entities --- debian/changelog | 2 ++ doc/apt-cache.8.xml | 17 ++------------ doc/apt-get.8.xml | 49 +++++----------------------------------- doc/apt.conf.5.xml | 10 +-------- doc/apt.ent | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 68 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5ddd84117..c5a786919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. + * doc/apt.ent, all man pages: + - move the description of files to globally usable entities -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 8b76f55b9..26d55a519 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -357,21 +357,8 @@ Reverse Provides: <refsect1><title>Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-statelists; diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3a1292198..ec773edeb 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -558,50 +558,11 @@ Files - /etc/apt/sources.list - Locations to fetch packages from. - Configuration Item: Dir::Etc::SourceList. - - - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - - - /etc/apt/preferences - Version preferences file. - This is where you would specify "pinning", - i.e. a preference to get certain packages - from a separate source - or from a different version of a distribution. - Configuration Item: Dir::Etc::Preferences. - - - &cachedir;/archives/ - Storage area for retrieved package files. - Configuration Item: Dir::Cache::Archives. - - - &cachedir;/archives/partial/ - Storage area for package files in transit. - Configuration Item: Dir::Cache::Archives (implicit partial). - - - &statedir;/lists/ - Storage area for state information for each package resource specified in - &sources-list; - Configuration Item: Dir::State::Lists. - - - &statedir;/lists/partial/ - Storage area for state information in transit. - Configuration Item: Dir::State::Lists (implicit partial). - + &file-sourceslist; + &file-aptconf; + &file-preferences; + &file-cachearchives; + &file-statelists; diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 92ac5ec04..81be753f9 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -858,15 +858,7 @@ is commented. Files - /etc/apt/apt.conf - APT configuration file. - Configuration Item: Dir::Etc::Main. - - - /etc/apt/apt.conf.d/ - APT configuration file fragments. - Configuration Item: Dir::Etc::Parts. - + &file-aptconf; diff --git a/doc/apt.ent b/doc/apt.ent index 43ac2f8e5..9a4c17bcd 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -289,3 +289,67 @@ "> +/etc/apt/apt.conf + APT configuration file. + Configuration Item: Dir::Etc::Main. + + + /etc/apt/apt.conf.d/ + APT configuration file fragments. + Configuration Item: Dir::Etc::Parts. + +"> + +&cachedir;/archives/ + Storage area for retrieved package files. + Configuration Item: Dir::Cache::Archives. + + + &cachedir;/archives/partial/ + Storage area for package files in transit. + Configuration Item: Dir::Cache::Archives (implicit partial). + +"> + +/etc/apt/preferences + Version preferences file. + This is where you would specify "pinning", + i.e. a preference to get certain packages + from a separate source + or from a different version of a distribution. + Configuration Item: Dir::Etc::Preferences. + + + /etc/apt/preferences.d/ + File fragments for the version preferences. + Configuration Item: Dir::Etc::PreferencesParts. + +"> + +/etc/apt/sources.list + Locations to fetch packages from. + Configuration Item: Dir::Etc::SourceList. + + + /etc/apt/sources.list.d/ + File fragments for locations to fetch packages from. + Configuration Item: Dir::Etc::SourceParts. + +"> + +&statedir;/lists/ + Storage area for state information for each package resource specified in + &sources-list; + Configuration Item: Dir::State::Lists. + + + &statedir;/lists/partial/ + Storage area for state information in transit. + Configuration Item: Dir::State::Lists (implicit partial). + +"> -- cgit v1.2.3-70-g09d2 From daa4aa525a9d0de9a9a64be59615fc4be044bb83 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 17:47:59 +0200 Subject: document the new preferences.d folder in apt_preferences(Closes: #544017) --- debian/changelog | 2 ++ doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c5a786919..eebef40ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.ent, all man pages: - move the description of files to globally usable entities + * doc/apt_preferences.5.xml: + - document the new preferences.d folder (Closes: #544017) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 12ea606b7..159d61f2b 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -32,7 +32,8 @@ Description The APT preferences file /etc/apt/preferences -can be used to control which versions of packages will be selected +and the fragment files in the /etc/apt/preferences.d/ +folder can be used to control which versions of packages will be selected for installation. Several versions of a package may be available for installation when @@ -610,6 +611,13 @@ apt-get install package/sid + +Files + + &file-preferences; + + + See Also &apt-get; &apt-cache; &apt-conf; &sources-list; -- cgit v1.2.3-70-g09d2 From ebf2e25b204195892b6c4866b1517755efb590b4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 8 Sep 2009 23:11:11 +0200 Subject: add text at the top without failing in rred (Closes: #545694) Patch from Bernhard R. Link, thanks! --- debian/changelog | 2 ++ methods/rred.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eebef40ff..9aa1f6860 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,8 @@ apt (0.7.24) UNRELEASED; urgency=low - move the description of files to globally usable entities * doc/apt_preferences.5.xml: - document the new preferences.d folder (Closes: #544017) + * methods/rred.cc: + - add at the top without failing (by Bernhard R. Link, Closes: #545694) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/methods/rred.cc b/methods/rred.cc index 6fa57f3a6..27d95bdde 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -174,7 +174,7 @@ int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, hash); /* read the rest from infile */ - if (result > 0) { + if (result >= 0) { while (fgets(buffer, BUF_SIZE, in_file) != NULL) { written = fwrite(buffer, 1, strlen(buffer), out_file); hash->Add((unsigned char*)buffer, written); -- cgit v1.2.3-70-g09d2 From 453c7548fefd3c13927cb8a10e16cca121eb144b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 14:08:40 +0200 Subject: add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) --- buildlib/sizetable | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/buildlib/sizetable b/buildlib/sizetable index b5782360c..372ddd091 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -11,6 +11,7 @@ # The format is:- # CPU endian sizeof: char, int, short, long i386 little 1 4 2 4 +amd64 little 1 4 2 8 armeb big 1 4 2 4 arm little 1 4 2 4 alpha little 1 4 2 8 @@ -21,4 +22,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 -m32r big 1 4 2 4 \ No newline at end of file +m32r big 1 4 2 4 diff --git a/debian/changelog b/debian/changelog index 9aa1f6860..c308c05aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.7.24) UNRELEASED; urgency=low - document the new preferences.d folder (Closes: #544017) * methods/rred.cc: - add at the top without failing (by Bernhard R. Link, Closes: #545694) + * buildlib/sizetable: + - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 -- cgit v1.2.3-70-g09d2 From 159cf2bd7513b4bfa4e8da0526f3562f8610db67 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 14:15:33 +0200 Subject: debian/prerm: remove file as nobody will upgrade from 0.4.10 anymore --- debian/changelog | 2 ++ debian/prerm | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 debian/prerm (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c308c05aa..6b4b41478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add at the top without failing (by Bernhard R. Link, Closes: #545694) * buildlib/sizetable: - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) + * debian/prerm: + - remove file as nobody will upgrade from 0.4.10 anymore -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index 4a8d47782..000000000 --- a/debian/prerm +++ /dev/null @@ -1,15 +0,0 @@ -#! /bin/sh - -set -e - -#DEBHELPER# - -if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ] && - dpkg --compare-versions "$2" "<<" 0.4.10 -then - if [ ! -d /var/state/apt/ ]; then - ln -s /var/lib/apt /var/state/apt - touch /var/lib/apt/lists/partial/.delete-me-later - fi -fi - -- cgit v1.2.3-70-g09d2 From 388b9071a956d0a5fbf6ffa4fdef8c3bb1f755cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 9 Sep 2009 15:26:11 +0200 Subject: remove the suggestion on gnome-apt as it was removed from debian see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=414526 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b5cedbe2e..41620d3cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ apt (0.7.24) UNRELEASED; urgency=low - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058) * debian/prerm: - remove file as nobody will upgrade from 0.4.10 anymore + * debian/control: + - remove gnome-apt suggestion as it was removed from debian [ Christian Perrier ] * doc/fr/*, doc/po/fr.po: diff --git a/debian/control b/debian/control index bcf89da9b..a9c82f9e8 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt +Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3-70-g09d2 From 3e9c4f702ed45f6201bae44b628c84db69436b05 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 13 Sep 2009 00:32:35 +0200 Subject: add and document experimental options to make aggressive use of dpkg's trigger and configuration handling (Closes: #473461) Add NoTriggers option to add --no-triggers to all dpkg calls, NoConfiguration to prevent apt from trying to configure packages - dpkg should handle this in the last ConfigurePending call. This options are for now deactivated as they require more testing in real world situations, but the plan is to enable them in the near future if anything works well. --- apt-pkg/deb/dpkgpm.cc | 39 +++++-- apt-pkg/deb/dpkgpm.h | 2 +- debian/changelog | 3 + doc/apt.conf.5.xml | 46 ++++++++ doc/examples/configure-index | 15 ++- doc/po/apt-doc.pot | 229 +++++++++++++++++++++++++++------------- doc/po/fr.po | 230 +++++++++++++++++++++++++++------------- doc/po/ja.po | 243 +++++++++++++++++++++++++++++-------------- po/apt-all.pot | 26 ++--- 9 files changed, 589 insertions(+), 244 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index b4a2abcb5..04e257b1b 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -134,8 +134,11 @@ bool pkgDPkgPM::Configure(PkgIterator Pkg) { if (Pkg.end() == true) return false; - - List.push_back(Item(Item::Configure,Pkg)); + + bool static const NoConfigure = _config->FindB("DPkg::NoConfigure",false); + if (NoConfigure == false) + List.push_back(Item(Item::Configure,Pkg)); + return true; } /*}}}*/ @@ -190,6 +193,9 @@ bool pkgDPkgPM::SendV2Pkgs(FILE *F) // Write out the package actions in order. for (vector::iterator I = List.begin(); I != List.end(); I++) { + if(I->Pkg.end() == true) + continue; + pkgDepCache::StateCache &S = Cache[I->Pkg]; fprintf(F,"%s ",I->Pkg.Name()); @@ -629,6 +635,11 @@ bool pkgDPkgPM::Go(int OutStatusFd) if (RunScriptsWithPkgs("DPkg::Pre-Install-Pkgs") == false) return false; + // support subpressing of triggers processing for special + // cases like d-i that runs the triggers handling manually + if(_config->FindB("DPkg::ConfigurePending",_config->FindB("DPkg::NoConfigure",false)) == true) + List.push_back(Item(Item::ConfigurePending,PkgIterator())); + // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) static const struct DpkgState DpkgStatesOpMap[][7] = { @@ -666,6 +677,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) // and the PackageOpsTranslations (human readable strings) for (vector::const_iterator I = List.begin(); I != List.end();I++) { + if((*I).Pkg.end() == true) + continue; + string const name = (*I).Pkg.Name(); PackageOpsDone[name] = 0; for(int i=0; (DpkgStatesOpMap[(*I).Op][i]).state != NULL; i++) @@ -752,11 +766,16 @@ bool pkgDPkgPM::Go(int OutStatusFd) case Item::Configure: Args[n++] = "--configure"; - if (NoTriggers == true) - Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); break; - + + case Item::ConfigurePending: + Args[n++] = "--configure"; + Size += strlen(Args[n-1]); + Args[n++] = "--pending"; + Size += strlen(Args[n-1]); + break; + case Item::Install: Args[n++] = "--unpack"; Size += strlen(Args[n-1]); @@ -764,7 +783,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) Size += strlen(Args[n-1]); break; } - + + if (NoTriggers == true && I->Op != Item::ConfigurePending) + { + Args[n++] = "--no-triggers"; + Size += strlen(Args[n-1]); + } + // Write in the file or package names if (I->Op == Item::Install) { @@ -780,6 +805,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) { for (;I != J && Size < MaxArgBytes; I++) { + if((*I).Pkg.end() == true) + continue; Args[n++] = I->Pkg.Name(); Size += strlen(Args[n-1]); } diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index ebc7e32bf..0c266605a 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -53,7 +53,7 @@ class pkgDPkgPM : public pkgPackageManager struct Item { - enum Ops {Install, Configure, Remove, Purge} Op; + enum Ops {Install, Configure, Remove, Purge, ConfigurePending} Op; string File; PkgIterator Pkg; Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op), diff --git a/debian/changelog b/debian/changelog index 41620d3cb..44d39b6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,9 @@ apt (0.7.24) UNRELEASED; urgency=low - remove file as nobody will upgrade from 0.4.10 anymore * debian/control: - remove gnome-apt suggestion as it was removed from debian + * apt-pkg/deb/dpkgpm.cc: + - add and document experimental options to make aggressive + use of dpkg's trigger and configuration handling (Closes: #473461) [ Christian Perrier ] * doc/fr/*, doc/po/fr.po: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 81be753f9..89de8ea4e 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -464,6 +464,52 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; the default is to disable signing and produce all binaries. + + dpkg trigger usage + APT can call dpkg in a way so it can make aggressive use of triggers over + multiply calls of dpkg. Without further options dpkg will use triggers only in between his + own run. Activating these options can therefore descrease the time needed to perform the + install / upgrade. Note that it is intended to activate these options per default in the + future, but as it changes the way apt calling dpkg drastical it needs a lot more testing. + These options are therefore currently experimental and should not be used in + productive environments. Also it breaks the progress reporting so all frontends will + currently stay around half (or more) of the time in the 100% state while it actually configures + all packages. + If you have understand the current risks and problems with these options, but want + to help testing them create a new configuration file with the following three options activated. + Please report any bugs and problems you encounter and make sure to note that you have used + these options in the reports. Asking dpkg for help could also be useful for debugging proposes, + see e.g. dpkg --audit. +DPkg::NoTriggers "true"; +DPkg::NoConfigure "true"; +DPkg::ConfigurePending "true"; + + + + NoTriggers + Add the no triggers flag to all dpkg calls (expect the ConfigurePending call). + See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the + triggers then this flag is present unless it is explicit called to do so in an extra call. + Note that this option exists (undocumented) also in older apt versions with a slightly different + meaning: Previously these option only append --no-triggers to the configure calls to dpkg - + now apt will add these flag also to the unpack and remove calls. + + NoConfigure + Set this option to true will prevent apt to call explicit the configuration + for all packages. The packages will only be called to unpack (or remove), so dpkg can handle the + configuration process. Activating this option will implicit activate also the next option per + default as otherwise the system could end in an unconfigured status which could be unbootable! + + + 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 NoConfigure is set, but deactivating could be useful + if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you should + deactivate this option in all but the last run. + + + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 8025fa4b4..27118fb7e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -319,18 +319,25 @@ DSelect CheckDir "no"; } -DPkg +DPkg { + // let apt aggressivly use dpkg triggers + NoTriggers "true"; + NoConfigure "true"; + ConfigurePending "true"; + // Probably don't want to use force-downgrade.. Options {"--force-overwrite";"--force-downgrade";} - + // Auto re-mounting of a readonly /usr Pre-Invoke {"mount -o remount,rw /usr";}; Post-Invoke {"mount -o remount,ro /usr";}; - + + Chroot-Directory "/"; + // Prevents daemons from getting cwd as something mountable (default) Run-Directory "/"; - + // Build options for apt-get source --compile Build-Options "-b -uc"; diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 338ff4d53..526488a1c 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-09 14:58+0300\n" +"POT-Creation-Date: 2009-09-12 12:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1408,7 +1408,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:859 apt_preferences.5.xml:615 +#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:905 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1418,7 +1418,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" @@ -2673,7 +2673,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -4988,13 +4988,102 @@ msgid "" "default is to disable signing and produce all binaries." msgstr "" +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:468 +msgid "dpkg trigger usage" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:469 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore descrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:483 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"DPkg::NoConfigure \"true\";\n" +"DPkg::ConfigurePending \"true\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:478 +msgid "" +"If you have understand the current risks and problems with these options, " +"but want to help testing them create a new configuration file with the " +"following three options activated. Please report any bugs and problems you " +"encounter and make sure to note that you have used these options in the " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. <placeholder " +"type=\"literallayout\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:489 +msgid "NoTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:490 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +msgid "NoConfigure" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:498 +msgid "" +"Set this option to true will prevent apt to call explicit the configuration " +"for all packages. The packages will only be called to unpack (or remove), so " +"dpkg can handle the configuration process. Activating this option will " +"implicit activate also the next option per default as otherwise the system " +"could end in an unconfigured status which could be unbootable!" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:504 +msgid "ConfigurePending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:505 +msgid "" +"If this option is set apt will call <command>dpkg --configure " +"--pending</command> to let dpkg handle all required configurations and " +"triggers. This option is activated automatic per default if " +"<literal>NoConfigure</literal> is set, but deactivating could be useful if " +"you want to run APT multiple times in a row - e.g. in an installer. In this " +"sceneries you should deactivate this option in all but the last run." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:516 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:517 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5003,12 +5092,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:525 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:527 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5019,7 +5108,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:538 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5027,7 +5116,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:546 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5035,7 +5124,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:555 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5045,110 +5134,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:517 +#: apt.conf.5.xml:563 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:527 +#: apt.conf.5.xml:573 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:578 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:582 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:543 +#: apt.conf.5.xml:589 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:593 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:600 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:604 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:611 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:615 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:622 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:626 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:587 +#: apt.conf.5.xml:633 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:637 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:598 +#: apt.conf.5.xml:644 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:647 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:657 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:618 +#: apt.conf.5.xml:664 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:667 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 " @@ -5156,92 +5245,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:675 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:678 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:640 +#: apt.conf.5.xml:686 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:690 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:651 +#: apt.conf.5.xml:697 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:700 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:661 +#: apt.conf.5.xml:707 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:710 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:672 +#: apt.conf.5.xml:718 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:722 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:683 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:733 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:694 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:744 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:705 +#: apt.conf.5.xml:751 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:708 +#: apt.conf.5.xml:754 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5251,12 +5340,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:719 +#: apt.conf.5.xml:765 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:768 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5274,90 +5363,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:787 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:790 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:800 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:762 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:811 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:772 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:822 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:784 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:834 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:841 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:799 +#: apt.conf.5.xml:845 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:855 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:817 +#: apt.conf.5.xml:863 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:866 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 " @@ -5365,32 +5454,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:874 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:878 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:854 +#: apt.conf.5.xml:900 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:907 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:912 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 71327d583..ce0596a46 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-09-09 14:58+0300\n" +"POT-Creation-Date: 2009-09-12 12:51+0300\n" "PO-Revision-Date: 2009-09-04 20:23+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1882,7 +1882,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:859 apt_preferences.5.xml:615 +#: apt.conf.5.xml:905 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1895,7 +1895,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" @@ -3481,7 +3481,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -6793,14 +6793,104 @@ msgstr "" "paquets ; par défaut la signature est désactivée et tous les binaires sont " "créés." +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:468 +msgid "dpkg trigger usage" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:469 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore descrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:483 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"DPkg::NoConfigure \"true\";\n" +"DPkg::ConfigurePending \"true\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:478 +msgid "" +"If you have understand the current risks and problems with these options, " +"but want to help testing them create a new configuration file with the " +"following three options activated. Please report any bugs and problems you " +"encounter and make sure to note that you have used these options in the " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" +"\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:489 +msgid "NoTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:490 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +#, fuzzy +msgid "NoConfigure" +msgstr "Immediate-Configure" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:498 +msgid "" +"Set this option to true will prevent apt to call explicit the configuration " +"for all packages. The packages will only be called to unpack (or remove), so " +"dpkg can handle the configuration process. Activating this option will " +"implicit activate also the next option per default as otherwise the system " +"could end in an unconfigured status which could be unbootable!" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:504 +msgid "ConfigurePending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:505 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if <literal>NoConfigure</literal> " +"is set, but deactivating could be useful if you want to run APT multiple " +"times in a row - e.g. in an installer. In this sceneries you should " +"deactivate this option in all but the last run." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:516 #, fuzzy msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:517 #, fuzzy msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " @@ -6813,13 +6903,13 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:525 #, fuzzy msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:527 #, fuzzy msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " @@ -6838,7 +6928,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:538 #, fuzzy msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " @@ -6850,7 +6940,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:546 #, fuzzy msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " @@ -6862,7 +6952,7 @@ msgstr "" "<literal>apt-get -s install</literal>) sans être « root »." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:555 #, fuzzy msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " @@ -6875,7 +6965,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:517 +#: apt.conf.5.xml:563 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -6885,71 +6975,71 @@ msgstr "" "type statfs dans les ID de cédérom." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:573 #, fuzzy msgid "A full list of debugging options to apt follows." msgstr "Voici une liste complète des options de débogage de APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:578 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "Debug::Acquire::cdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:536 +#: apt.conf.5.xml:582 #, fuzzy msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "Affiche les informations concernant les sources de type cdrom://" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:543 +#: apt.conf.5.xml:589 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "Debug::Acquire::ftp" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:593 #, fuzzy 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:554 +#: apt.conf.5.xml:600 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "Debug::Acquire::http" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:604 #, fuzzy 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:565 +#: apt.conf.5.xml:611 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "Debug::Acquire::https" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:569 +#: apt.conf.5.xml:615 #, fuzzy msgid "Print information related to downloading packages using HTTPS." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:622 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "Debug::Acquire::gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:626 #, fuzzy msgid "" "Print information related to verifying cryptographic signatures using " @@ -6959,13 +7049,13 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:633 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "Debug::aptcdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:637 #, fuzzy msgid "" "Output information about the process of accessing collections of packages " @@ -6975,13 +7065,13 @@ msgstr "" "stockées sur cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:644 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "Debug::BuildDeps" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:647 #, fuzzy msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" @@ -6989,13 +7079,13 @@ msgstr "" "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:654 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "Debug::Hashes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:657 #, fuzzy msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" @@ -7005,13 +7095,13 @@ msgstr "" "librairies APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:664 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "Debug::IdentCdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:667 #, fuzzy msgid "" "Do not include information from <literal>statfs</literal>, namely the number " @@ -7023,13 +7113,13 @@ msgstr "" "sur le système de fichier du cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:675 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "Debug::NoLocking" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:678 #, fuzzy msgid "" "Disable all file locking. For instance, this will allow two instances of " @@ -7039,13 +7129,13 @@ msgstr "" "deux instances de « apt-get update » en même temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:640 +#: apt.conf.5.xml:686 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "Debug::pkgAcquire" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:690 #, fuzzy msgid "Log when items are added to or removed from the global download queue." msgstr "" @@ -7053,13 +7143,13 @@ msgstr "" "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:651 +#: apt.conf.5.xml:697 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "Debug::pkgAcquire::Auth" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:700 #, fuzzy msgid "" "Output status messages and errors related to verifying checksums and " @@ -7070,13 +7160,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "Debug::pkgAcquire::Diffs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:710 #, fuzzy msgid "" "Output information about downloading and applying package index list diffs, " @@ -7087,13 +7177,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "Debug::pkgAcquire::RRed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:722 #, fuzzy msgid "" "Output information related to patching apt package lists when downloading " @@ -7104,13 +7194,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "Debug::pkgAcquire::Worker" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:733 #, fuzzy msgid "" "Log all interactions with the sub-processes that actually perform downloads." @@ -7119,13 +7209,13 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "Debug::pkgAcquire::pkgAutoRemove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:744 #, fuzzy msgid "" "Log events related to the automatically-installed status of packages and to " @@ -7135,13 +7225,13 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:751 #, fuzzy msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:708 +#: apt.conf.5.xml:754 #, fuzzy msgid "" "Generate debug messages describing which packages are being automatically " @@ -7157,13 +7247,13 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:719 +#: apt.conf.5.xml:765 #, fuzzy msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:768 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7180,13 +7270,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:787 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "Debug::pkgInitConfig" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:790 #, fuzzy msgid "Dump the default configuration to standard error on startup." msgstr "" @@ -7194,13 +7284,13 @@ msgstr "" "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:797 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "Debug::pkgDPkgPM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:800 #, fuzzy msgid "" "When invoking &dpkg;, output the precise command line with which it is being " @@ -7210,13 +7300,13 @@ msgstr "" "arguments sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:762 +#: apt.conf.5.xml:808 #, fuzzy msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "Debug::pkgDPkgProgressReporting" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:811 #, fuzzy msgid "" "Output all the data received from &dpkg; on the status file descriptor and " @@ -7227,13 +7317,13 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:772 +#: apt.conf.5.xml:818 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "Debug::pkgOrderList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:822 #, fuzzy msgid "" "Generate a trace of the algorithm that decides the order in which " @@ -7243,38 +7333,38 @@ msgstr "" "APT passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:784 +#: apt.conf.5.xml:830 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "Debug::pkgPackageManager" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:834 #, fuzzy 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:795 +#: apt.conf.5.xml:841 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "Debug::pkgPolicy" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:799 +#: apt.conf.5.xml:845 #, fuzzy msgid "Output the priority of each package list on startup." msgstr "Au lancement, affiche la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:851 #, fuzzy msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:855 #, fuzzy msgid "" "Trace the execution of the dependency resolver (this applies only to what " @@ -7284,13 +7374,13 @@ 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:817 +#: apt.conf.5.xml:863 #, fuzzy msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:820 +#: apt.conf.5.xml:866 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 " @@ -7298,13 +7388,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:874 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "Debug::sourceList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:878 #, fuzzy msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." @@ -7314,7 +7404,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:900 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7324,7 +7414,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:907 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7332,7 +7422,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:912 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" diff --git a/doc/po/ja.po b/doc/po/ja.po index 5458d85ff..1e09006f9 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-09 14:58+0300\n" +"POT-Creation-Date: 2009-09-12 12:51+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1928,7 +1928,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:859 apt_preferences.5.xml:615 +#: apt.conf.5.xml:905 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1942,7 +1942,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:865 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" @@ -3630,7 +3630,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:853 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -6851,13 +6851,106 @@ msgstr "" "これらのオプションは、パッケージのコンパイル時に &dpkg-buildpackage; に渡され" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:468 +msgid "dpkg trigger usage" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:469 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore descrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:483 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"DPkg::NoConfigure \"true\";\n" +"DPkg::ConfigurePending \"true\";" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:478 +msgid "" +"If you have understand the current risks and problems with these options, " +"but want to help testing them create a new configuration file with the " +"following three options activated. Please report any bugs and problems you " +"encounter and make sure to note that you have used these options in the " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" +"\" id=\"0\"/>" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:489 +msgid "NoTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:490 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" + +# type: Content of: <refentry><refnamediv><refname> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:497 +#, fuzzy +msgid "NoConfigure" +msgstr "config-files" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:498 +msgid "" +"Set this option to true will prevent apt to call explicit the configuration " +"for all packages. The packages will only be called to unpack (or remove), so " +"dpkg can handle the configuration process. Activating this option will " +"implicit activate also the next option per default as otherwise the system " +"could end in an unconfigured status which could be unbootable!" +msgstr "" + +# type: Content of: <refentry><refsect1><title> +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:504 +#, fuzzy +msgid "ConfigurePending" +msgstr "ユーザの設定" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:505 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if <literal>NoConfigure</literal> " +"is set, but deactivating could be useful if you want to run APT multiple " +"times in a row - e.g. in an installer. In this sceneries you should " +"deactivate this option in all but the last run." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:470 +#: apt.conf.5.xml:516 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:517 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6871,12 +6964,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:525 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:481 +#: apt.conf.5.xml:527 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6887,7 +6980,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:538 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6898,7 +6991,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:500 +#: apt.conf.5.xml:546 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6909,7 +7002,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:555 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6919,66 +7012,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:563 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:527 +#: apt.conf.5.xml:573 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:578 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:536 +#: apt.conf.5.xml:582 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:543 +#: apt.conf.5.xml:589 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:547 +#: apt.conf.5.xml:593 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:554 +#: apt.conf.5.xml:600 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:558 +#: apt.conf.5.xml:604 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:611 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:569 +#: apt.conf.5.xml:615 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:576 +#: apt.conf.5.xml:622 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:580 +#: apt.conf.5.xml:626 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -6986,46 +7079,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:587 +#: apt.conf.5.xml:633 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:591 +#: apt.conf.5.xml:637 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:598 +#: apt.conf.5.xml:644 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:647 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:657 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:618 +#: apt.conf.5.xml:664 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:667 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 " @@ -7033,93 +7126,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:675 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:632 +#: apt.conf.5.xml:678 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:640 +#: apt.conf.5.xml:686 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:690 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:651 +#: apt.conf.5.xml:697 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:654 +#: apt.conf.5.xml:700 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:661 +#: apt.conf.5.xml:707 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:664 +#: apt.conf.5.xml:710 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:672 +#: apt.conf.5.xml:718 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:676 +#: apt.conf.5.xml:722 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:683 +#: apt.conf.5.xml:729 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:687 +#: apt.conf.5.xml:733 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:694 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:744 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:705 +#: apt.conf.5.xml:751 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:708 +#: apt.conf.5.xml:754 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7129,12 +7222,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:719 +#: apt.conf.5.xml:765 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:722 +#: apt.conf.5.xml:768 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7151,91 +7244,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:787 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:790 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:800 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:762 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:811 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:772 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:776 +#: apt.conf.5.xml:822 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:784 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:788 +#: apt.conf.5.xml:834 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:795 +#: apt.conf.5.xml:841 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:799 +#: apt.conf.5.xml:845 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:809 +#: apt.conf.5.xml:855 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:817 +#: apt.conf.5.xml:863 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:820 +#: apt.conf.5.xml:866 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 " @@ -7243,12 +7336,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:874 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:878 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7256,7 +7349,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:854 +#: apt.conf.5.xml:900 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7266,7 +7359,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:861 +#: apt.conf.5.xml:907 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7275,7 +7368,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:912 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9863,11 +9956,6 @@ msgstr "&apt-cache; &apt-conf;" #~ msgid "Operation failed" #~ msgstr "オプション" -# type: Content of: <refentry><refnamediv><refname> -#, fuzzy -#~ msgid "Config-Item" -#~ msgstr "config-files" - # type: <tag></tag> #, fuzzy #~ msgid "Single-Instance" @@ -9893,11 +9981,6 @@ msgstr "&apt-cache; &apt-conf;" #~ msgid "Version string for the method" #~ msgstr "ユーザの設定" -# type: Content of: <refentry><refsect1><title> -#, fuzzy -#~ msgid "601 Configuration" -#~ msgstr "ユーザの設定" - #, fuzzy #~ msgid "Notes" #~ msgstr "contents" diff --git a/po/apt-all.pot b/po/apt-all.pot index a037df160..d4b0d2542 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2666,12 +2666,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Removing %s" msgstr "" @@ -2681,56 +2681,56 @@ msgstr "" msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:546 +#: apt-pkg/deb/dpkgpm.cc:554 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:635 +#: apt-pkg/deb/dpkgpm.cc:648 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:636 +#: apt-pkg/deb/dpkgpm.cc:649 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:641 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:643 +#: apt-pkg/deb/dpkgpm.cc:656 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:648 +#: apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:650 +#: apt-pkg/deb/dpkgpm.cc:663 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:656 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:820 +#: apt-pkg/deb/dpkgpm.cc:849 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:848 +#: apt-pkg/deb/dpkgpm.cc:877 msgid "Running dpkg" msgstr "" -- cgit v1.2.3-70-g09d2 From 5e312de78360736fa3ef505909ef84da211362ca Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 15 Sep 2009 23:52:04 +0200 Subject: Add even more config options and try to handle configuration problems arising if we upgrade essential or predependencies which need to be configured before even unpacking packages depending on them. --- apt-pkg/deb/dpkgpm.cc | 28 +++-- apt-pkg/deb/dpkgpm.h | 2 +- apt-pkg/orderlist.cc | 74 ++++++++---- apt-pkg/packagemanager.cc | 37 ++++-- debian/changelog | 4 +- doc/apt.conf.5.xml | 81 ++++++++++--- doc/po/apt-doc.pot | 293 +++++++++++++++++++++++++++++---------------- doc/po/fr.po | 296 +++++++++++++++++++++++++++++---------------- doc/po/ja.po | 299 ++++++++++++++++++++++++++++++---------------- po/apt-all.pot | 30 ++--- 10 files changed, 760 insertions(+), 384 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 04e257b1b..5edab5ac7 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -135,9 +135,12 @@ bool pkgDPkgPM::Configure(PkgIterator Pkg) if (Pkg.end() == true) return false; - bool static const NoConfigure = _config->FindB("DPkg::NoConfigure",false); - if (NoConfigure == false) - List.push_back(Item(Item::Configure,Pkg)); + List.push_back(Item(Item::Configure, Pkg)); + + // Use triggers for config calls if we configure "smart" + // as otherwise Pre-Depends will not be satisfied, see #526774 + if (_config->FindB("DPkg::TriggersPending", false) == true) + List.push_back(Item(Item::TriggersPending, PkgIterator())); return true; } @@ -627,7 +630,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) unsigned int const MaxArgs = _config->FindI("Dpkg::MaxArgs",8*1024); unsigned int const MaxArgBytes = _config->FindI("Dpkg::MaxArgBytes",32*1024); - bool const NoTriggers = _config->FindB("DPkg::NoTriggers",false); + bool const NoTriggers = _config->FindB("DPkg::NoTriggers", false); + bool const NoConfTriggers = _config->FindB("DPkg::NoConfTriggers", NoTriggers); if (RunScripts("DPkg::Pre-Invoke") == false) return false; @@ -637,8 +641,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) // support subpressing of triggers processing for special // cases like d-i that runs the triggers handling manually - if(_config->FindB("DPkg::ConfigurePending",_config->FindB("DPkg::NoConfigure",false)) == true) - List.push_back(Item(Item::ConfigurePending,PkgIterator())); + bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all"); + if (_config->FindB("DPkg::ConfigurePending", SmartConf) == true) + List.push_back(Item(Item::ConfigurePending, PkgIterator())); // map the dpkg states to the operations that are performed // (this is sorted in the same way as Item::Ops) @@ -776,6 +781,13 @@ bool pkgDPkgPM::Go(int OutStatusFd) Size += strlen(Args[n-1]); break; + case Item::TriggersPending: + Args[n++] = "--triggers-only"; + Size += strlen(Args[n-1]); + Args[n++] = "--pending"; + Size += strlen(Args[n-1]); + break; + case Item::Install: Args[n++] = "--unpack"; Size += strlen(Args[n-1]); @@ -784,7 +796,9 @@ bool pkgDPkgPM::Go(int OutStatusFd) break; } - if (NoTriggers == true && I->Op != Item::ConfigurePending) + if (NoTriggers == true && I->Op != Item::TriggersPending && + I->Op != Item::ConfigurePending && + (I->Op != Item::Configure || NoConfTriggers == true)) { Args[n++] = "--no-triggers"; Size += strlen(Args[n-1]); diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 0c266605a..43e5c7d45 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -53,7 +53,7 @@ class pkgDPkgPM : public pkgPackageManager struct Item { - enum Ops {Install, Configure, Remove, Purge, ConfigurePending} Op; + enum Ops {Install, Configure, Remove, Purge, ConfigurePending, TriggersPending} Op; string File; PkgIterator Pkg; Item(Ops Op,PkgIterator Pkg,string File = "") : Op(Op), diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc index 01b150722..e5bd8247d 100644 --- a/apt-pkg/orderlist.cc +++ b/apt-pkg/orderlist.cc @@ -174,22 +174,35 @@ bool pkgOrderList::DoRun() bool pkgOrderList::OrderCritical() { FileList = 0; - + Primary = &pkgOrderList::DepUnPackPre; Secondary = 0; RevDepends = 0; Remove = 0; LoopCount = 0; - + // Sort Me = this; - qsort(List,End - List,sizeof(*List),&OrderCompareB); - + qsort(List,End - List,sizeof(*List),&OrderCompareB); + if (DoRun() == false) return false; - + if (LoopCount != 0) return _error->Error("Fatal, predepends looping detected"); + + if (Debug == true) + { + clog << "** Critical Unpack ordering done" << endl; + + for (iterator I = List; I != End; I++) + { + PkgIterator P(Cache,*I); + if (IsNow(P) == true) + clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + } + } + return true; } /*}}}*/ @@ -205,7 +218,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) if (FileList != 0) { WipeFlags(After); - + // Set the inlist flag for (iterator I = List; I != End; I++) { @@ -214,7 +227,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) Flag(*I,After); } } - + Primary = &pkgOrderList::DepUnPackCrit; Secondary = &pkgOrderList::DepConfigure; RevDepends = &pkgOrderList::DepUnPackDep; @@ -225,11 +238,16 @@ bool pkgOrderList::OrderUnpack(string *FileList) Me = this; qsort(List,End - List,sizeof(*List),&OrderCompareA); - if (Debug == true) - clog << "** Pass A" << endl; - if (DoRun() == false) - return false; - + if (_config->Find("PackageManager::Configure","all") == "all") + { + if (Debug == true) + clog << "** Pass A" << endl; + if (DoRun() == false) + return false; + } + else if (Debug == true) + clog << "** Skip A (same as B for non-all Configure)" << endl; + if (Debug == true) clog << "** Pass B" << endl; Secondary = 0; @@ -243,7 +261,7 @@ bool pkgOrderList::OrderUnpack(string *FileList) Remove = 0; // Otherwise the libreadline remove problem occures if (DoRun() == false) return false; - + if (Debug == true) clog << "** Pass D" << endl; LoopCount = 0; @@ -259,9 +277,9 @@ bool pkgOrderList::OrderUnpack(string *FileList) { PkgIterator P(Cache,*I); if (IsNow(P) == true) - clog << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; + clog << " " << P.Name() << ' ' << IsMissing(P) << ',' << IsFlag(P,After) << endl; } - } + } return true; } @@ -286,29 +304,35 @@ bool pkgOrderList::OrderConfigure() /* Higher scores order earlier */ int pkgOrderList::Score(PkgIterator Pkg) { + static int const ScoreDelete = _config->FindI("OrderList::Score::Delete", 500); + // Removal is always done first if (Cache[Pkg].Delete() == true) - return 200; - + return ScoreDelete; + // This should never happen.. if (Cache[Pkg].InstVerIter(Cache).end() == true) return -1; - + + static int const ScoreEssential = _config->FindI("OrderList::Score::Essential", 200); + static int const ScoreImmediate = _config->FindI("OrderList::Score::Immediate", 10); + static int const ScorePreDepends = _config->FindI("OrderList::Score::PreDepends", 50); + int Score = 0; if ((Pkg->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) - Score += 100; + Score += ScoreEssential; if (IsFlag(Pkg,Immediate) == true) - Score += 10; - - for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); + Score += ScoreImmediate; + + for (DepIterator D = Cache[Pkg].InstVerIter(Cache).DependsList(); D.end() == false; D++) if (D->Type == pkgCache::Dep::PreDepends) { - Score += 50; + Score += ScorePreDepends; break; } - + // Important Required Standard Optional Extra signed short PrioMap[] = {0,5,4,3,1,0}; if (Cache[Pkg].InstVerIter(Cache)->Priority <= 5) @@ -386,6 +410,7 @@ int pkgOrderList::OrderCompareA(const void *a, const void *b) int ScoreA = Me->Score(A); int ScoreB = Me->Score(B); + if (ScoreA > ScoreB) return -1; @@ -422,6 +447,7 @@ int pkgOrderList::OrderCompareB(const void *a, const void *b) int ScoreA = Me->Score(A); int ScoreB = Me->Score(B); + if (ScoreA > ScoreB) return -1; diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index cc9ce21c7..442143516 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -57,7 +57,10 @@ bool pkgPackageManager::GetArchives(pkgAcquire *Owner,pkgSourceList *Sources, if (CreateOrderList() == false) return false; - if (List->OrderUnpack() == false) + bool const ordering = + _config->FindB("PackageManager::UnpackAll",true) ? + List->OrderUnpack() : List->OrderCritical(); + if (ordering == false) return _error->Error("Internal ordering error"); for (pkgOrderList::iterator I = List->begin(); I != List->end(); I++) @@ -163,7 +166,7 @@ bool pkgPackageManager::CreateOrderList() delete List; List = new pkgOrderList(&Cache); - bool NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true); + static bool const NoImmConfigure = !_config->FindB("APT::Immediate-Configure",true); // Generate the list of affected packages and sort it for (PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) @@ -266,13 +269,16 @@ bool pkgPackageManager::ConfigureAll() if (OList.OrderConfigure() == false) return false; - + + std::string const conf = _config->Find("PackageManager::Configure","all"); + bool const ConfigurePkgs = (conf == "all"); + // Perform the configuring for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++) { PkgIterator Pkg(Cache,*I); - if (Configure(Pkg) == false) + if (ConfigurePkgs == true && Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -291,16 +297,20 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg) if (DepAdd(OList,Pkg) == false) return false; - - if (OList.OrderConfigure() == false) - return false; - + + static std::string const conf = _config->Find("PackageManager::Configure","all"); + static bool const ConfigurePkgs = (conf == "all" || conf == "smart"); + + if (ConfigurePkgs == true) + if (OList.OrderConfigure() == false) + return false; + // Perform the configuring for (pkgOrderList::iterator I = OList.begin(); I != OList.end(); I++) { PkgIterator Pkg(Cache,*I); - if (Configure(Pkg) == false) + if (ConfigurePkgs == true && Configure(Pkg) == false) return false; List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States); @@ -577,9 +587,12 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() Reset(); if (Debug == true) - clog << "Begining to order" << endl; + clog << "Beginning to order" << endl; - if (List->OrderUnpack(FileNames) == false) + bool const ordering = + _config->FindB("PackageManager::UnpackAll",true) ? + List->OrderUnpack(FileNames) : List->OrderCritical(); + if (ordering == false) { _error->Error("Internal ordering error"); return Failed; @@ -632,7 +645,7 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall() return Failed; DoneSomething = true; } - + // Final run through the configure phase if (ConfigureAll() == false) return Failed; diff --git a/debian/changelog b/debian/changelog index 44d39b6aa..6a880144f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,8 +39,8 @@ apt (0.7.24) UNRELEASED; urgency=low - remove file as nobody will upgrade from 0.4.10 anymore * debian/control: - remove gnome-apt suggestion as it was removed from debian - * apt-pkg/deb/dpkgpm.cc: - - add and document experimental options to make aggressive + * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc: + - add and document _experimental_ options to make (aggressive) use of dpkg's trigger and configuration handling (Closes: #473461) [ Christian Perrier ] diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 89de8ea4e..808c852a5 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -465,28 +465,30 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> </variablelist> - <refsect2><title>dpkg trigger usage + dpkg trigger usage (and related options) APT can call dpkg in a way so it can make aggressive use of triggers over multiply calls of dpkg. Without further options dpkg will use triggers only in between his - own run. Activating these options can therefore descrease the time needed to perform the + own run. Activating these options can therefore decrease the time needed to perform the install / upgrade. Note that it is intended to activate these options per default in the - future, but as it changes the way apt calling dpkg drastical it needs a lot more testing. + future, but as it changes the way APT calling dpkg drastical it needs a lot more testing. These options are therefore currently experimental and should not be used in productive environments. Also it breaks the progress reporting so all frontends will currently stay around half (or more) of the time in the 100% state while it actually configures all packages. - If you have understand the current risks and problems with these options, but want - to help testing them create a new configuration file with the following three options activated. - Please report any bugs and problems you encounter and make sure to note that you have used - these options in the reports. Asking dpkg for help could also be useful for debugging proposes, - see e.g. dpkg --audit. + Note that it is not garanteed that APT will support these options or that these options will + not cause (big) trouble in the future. If you have understand the current risks and problems with + these options, but are brave enough to help testing them create a new configuration file and test a + combination of options. Please report any bugs, problems and improvements you encounter and make sure + to note which options you have used in your reports. Asking dpkg for help could also be useful for + debugging proposes, see e.g. dpkg --audit. A defensive option combination would be DPkg::NoTriggers "true"; -DPkg::NoConfigure "true"; -DPkg::ConfigurePending "true"; - +PackageManager::Configure "smart"; +DPkg::ConfigurePending "true"; +DPkg::TriggersPending "true"; +OrderList::Score::Immediate 100; - NoTriggers + DPkg::NoTriggers Add the no triggers flag to all dpkg calls (expect the ConfigurePending call). See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the triggers then this flag is present unless it is explicit called to do so in an extra call. @@ -494,20 +496,61 @@ DPkg::ConfigurePending "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. - NoConfigure - Set this option to true will prevent apt to call explicit the configuration - for all packages. The packages will only be called to unpack (or remove), so dpkg can handle the - configuration process. Activating this option will implicit activate also the next option per + 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 + another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated + by the next option. "no" on the other hand will not configure anything and totally + relay on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered). + Setting this option to another than the all value will implicit activate also the next option per default as otherwise the system could end in an unconfigured status which could be unbootable! - ConfigurePending + 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 NoConfigure is set, but deactivating could be useful - if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you should + 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 this 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. + + Dpkg::NoConfTriggers + DPkg currently will ignore the --triggers or --no-triggers flag if the trigger + is already pending. This option therefore has no real effect as long as dpkg doesn't change + his behavior. The option is automatical activated if DPkg::NoTriggers is + activated. You should use DPkg::TriggersPending to take care of these pending + triggers. + + 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 verious steps by everything. While both method + were present in earlier APT versions the OrderCritical method was unused, so + 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 + will run quite a few triggers (which maybe not needed). Essentials get per default a high score + but the immediate flag is relativly low (a package which has a Pre-Depends is higher rated). + These option and the others in the same group can be used to change the scoring. The following + example shows the settings with there default values. + OrderList::Score { + Delete 500; + Essential 200; + Immediate 10; + PreDepends 50; +}; + + diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 526488a1c..6a54450c4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-12 12:51+0300\n" +"POT-Creation-Date: 2009-09-15 22:56+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1408,7 +1408,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:905 apt_preferences.5.xml:615 +#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:948 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1418,7 +1418,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" @@ -2673,7 +2673,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -4990,7 +4990,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:468 -msgid "dpkg trigger usage" +msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -4998,10 +4998,10 @@ msgstr "" msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " -"in between his own run. Activating these options can therefore descrease the " +"in between his own run. Activating these options can therefore decrease the " "time needed to perform the install / upgrade. Note that it is intended to " "activate these options per default in the future, but as it changes the way " -"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"APT calling dpkg drastical it needs a lot more testing. <emphasis>These " "options are therefore currently experimental and should not be used in " "productive environments.</emphasis> Also it breaks the progress reporting so " "all frontends will currently stay around half (or more) of the time in the " @@ -5009,33 +5009,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" -"DPkg::NoConfigure \"true\";\n" -"DPkg::ConfigurePending \"true\";" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";\n" +"OrderList::Score::Immediate 100;" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:478 msgid "" -"If you have understand the current risks and problems with these options, " -"but want to help testing them create a new configuration file with the " -"following three options activated. Please report any bugs and problems you " -"encounter and make sure to note that you have used these options in the " +"Note that it is not garanteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " "reports. Asking dpkg for help could also be useful for debugging proposes, " -"see e.g. <command>dpkg --audit</command>. <placeholder " -"type=\"literallayout\" id=\"0\"/>" +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 -msgid "NoTriggers" +#: apt.conf.5.xml:491 +msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:492 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5047,43 +5051,130 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:497 -msgid "NoConfigure" +#: apt.conf.5.xml:499 +msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 -msgid "" -"Set this option to true will prevent apt to call explicit the configuration " -"for all packages. The packages will only be called to unpack (or remove), so " -"dpkg can handle the configuration process. Activating this option will " -"implicit activate also the next option per default as otherwise the system " -"could end in an unconfigured status which could be unbootable!" +#: apt.conf.5.xml:500 +msgid "" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next " +"option. \"<literal>no</literal>\" on the other hand will not configure " +"anything and totally relay on dpkg for configuration (which will at the " +"moment fail if a Pre-Depends is encountered). Setting this option to " +"another than the all value will implicit activate also the next option per " +"default as otherwise the system could end in an unconfigured status which " +"could be unbootable!" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:504 -msgid "ConfigurePending" +#: apt.conf.5.xml:510 +msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:511 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " -"triggers. This option is activated automatic per default if " -"<literal>NoConfigure</literal> is set, but deactivating could be useful if " -"you want to run APT multiple times in a row - e.g. in an installer. In this " -"sceneries you should deactivate this option in all but the last run." +"triggers. This option is activated automatic per default if the previous " +"option is not set to <literal>all</literal>, but deactivating could be " +"useful if you want to run APT multiple times in a row - e.g. in an " +"installer. In this sceneries you could deactivate this option in all but the " +"last run." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:517 +msgid "DPkg::TriggersPending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:518 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> 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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:523 +msgid "Dpkg::NoConfTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:524 +msgid "" +"DPkg currently will ignore the --triggers or --no-triggers flag if the " +"trigger is already pending. This option therefore has no real effect as long " +"as dpkg doesn't change his behavior. The option is automatical activated if " +"<literal>DPkg::NoTriggers</literal> is activated. You should use " +"<literal>DPkg::TriggersPending</literal> to take care of these pending " +"triggers." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "PackageManager::UnpackAll" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +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-Depends. Default is true and therefore the \"old\" method of ordering in " +"verious steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:538 +msgid "OrderList::Score::Immediate" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:546 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:539 +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 " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relativly low (a package which has a Pre-Depends is higher " +"rated). These option and the others in the same group can be used to change " +"the scoring. The following example shows the settings with there default " +"values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:559 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:560 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5092,12 +5183,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:568 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:570 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5108,7 +5199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:581 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5116,7 +5207,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:589 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5124,7 +5215,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:555 +#: apt.conf.5.xml:598 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5134,110 +5225,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:563 +#: apt.conf.5.xml:606 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:573 +#: apt.conf.5.xml:616 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:621 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:625 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:632 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:636 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:643 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:647 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:654 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:658 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:622 +#: apt.conf.5.xml:665 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:669 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:633 +#: apt.conf.5.xml:676 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:680 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:644 +#: apt.conf.5.xml:687 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:690 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:697 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:700 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:664 +#: apt.conf.5.xml:707 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:710 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 " @@ -5245,92 +5336,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:718 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:721 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:686 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:733 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:697 +#: apt.conf.5.xml:740 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:743 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:707 +#: apt.conf.5.xml:750 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:753 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:718 +#: apt.conf.5.xml:761 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:765 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:729 +#: apt.conf.5.xml:772 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:776 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:740 +#: apt.conf.5.xml:783 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:787 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:751 +#: apt.conf.5.xml:794 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:797 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5340,12 +5431,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:811 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5363,90 +5454,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:833 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:843 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:808 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:854 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:818 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:865 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:830 +#: apt.conf.5.xml:873 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:877 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:884 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:845 +#: apt.conf.5.xml:888 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:898 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:863 +#: apt.conf.5.xml:906 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:909 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 " @@ -5454,32 +5545,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:917 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:921 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:900 +#: apt.conf.5.xml:943 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:907 +#: apt.conf.5.xml:950 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:912 +#: apt.conf.5.xml:955 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index ce0596a46..17ed328b1 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-09-12 12:51+0300\n" +"POT-Creation-Date: 2009-09-15 22:56+0300\n" "PO-Revision-Date: 2009-09-04 20:23+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1882,7 +1882,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:905 apt_preferences.5.xml:615 +#: apt.conf.5.xml:948 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1895,7 +1895,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" @@ -3481,7 +3481,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -6795,7 +6795,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:468 -msgid "dpkg trigger usage" +msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6803,10 +6803,10 @@ msgstr "" msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " -"in between his own run. Activating these options can therefore descrease the " +"in between his own run. Activating these options can therefore decrease the " "time needed to perform the install / upgrade. Note that it is intended to " "activate these options per default in the future, but as it changes the way " -"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"APT calling dpkg drastical it needs a lot more testing. <emphasis>These " "options are therefore currently experimental and should not be used in " "productive environments.</emphasis> Also it breaks the progress reporting so " "all frontends will currently stay around half (or more) of the time in the " @@ -6814,33 +6814,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" -"DPkg::NoConfigure \"true\";\n" -"DPkg::ConfigurePending \"true\";" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";\n" +"OrderList::Score::Immediate 100;" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:478 msgid "" -"If you have understand the current risks and problems with these options, " -"but want to help testing them create a new configuration file with the " -"following three options activated. Please report any bugs and problems you " -"encounter and make sure to note that you have used these options in the " +"Note that it is not garanteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " "reports. Asking dpkg for help could also be useful for debugging proposes, " -"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" -"\" id=\"0\"/>" +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 -msgid "NoTriggers" +#: apt.conf.5.xml:491 +msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:492 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6852,45 +6856,131 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:499 #, fuzzy -msgid "NoConfigure" -msgstr "Immediate-Configure" +#| msgid "Packages::Compress" +msgid "PackageManager::Configure" +msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:500 msgid "" -"Set this option to true will prevent apt to call explicit the configuration " -"for all packages. The packages will only be called to unpack (or remove), so " -"dpkg can handle the configuration process. Activating this option will " -"implicit activate also the next option per default as otherwise the system " -"could end in an unconfigured status which could be unbootable!" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally relay on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicit activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:504 -msgid "ConfigurePending" +#: apt.conf.5.xml:510 +msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:511 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " -"option is activated automatic per default if <literal>NoConfigure</literal> " -"is set, but deactivating could be useful if you want to run APT multiple " -"times in a row - e.g. in an installer. In this sceneries you should " -"deactivate this option in all but the last run." +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In this sceneries " +"you could deactivate this option in all but the last run." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:517 +msgid "DPkg::TriggersPending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:518 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> 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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:523 +msgid "Dpkg::NoConfTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:524 +msgid "" +"DPkg currently will ignore the --triggers or --no-triggers flag if the " +"trigger is already pending. This option therefore has no real effect as long " +"as dpkg doesn't change his behavior. The option is automatical activated if " +"<literal>DPkg::NoTriggers</literal> is activated. You should use " +"<literal>DPkg::TriggersPending</literal> to take care of these pending " +"triggers." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "PackageManager::UnpackAll" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +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-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"verious steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:538 +msgid "OrderList::Score::Immediate" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:546 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:539 +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 " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relativly low (a package which has a Pre-Depends is higher " +"rated). These option and the others in the same group can be used to change " +"the scoring. The following example shows the settings with there default " +"values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:559 #, fuzzy msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:560 #, fuzzy msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " @@ -6903,13 +6993,13 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:568 #, fuzzy msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:570 #, fuzzy msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " @@ -6928,7 +7018,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:581 #, fuzzy msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " @@ -6940,7 +7030,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:589 #, fuzzy msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " @@ -6952,7 +7042,7 @@ msgstr "" "<literal>apt-get -s install</literal>) sans être « root »." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:555 +#: apt.conf.5.xml:598 #, fuzzy msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " @@ -6965,7 +7055,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:563 +#: apt.conf.5.xml:606 #, fuzzy msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " @@ -6975,71 +7065,71 @@ msgstr "" "type statfs dans les ID de cédérom." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:616 #, fuzzy msgid "A full list of debugging options to apt follows." msgstr "Voici une liste complète des options de débogage de APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:621 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "Debug::Acquire::cdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:582 +#: apt.conf.5.xml:625 #, fuzzy msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "Affiche les informations concernant les sources de type cdrom://" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:589 +#: apt.conf.5.xml:632 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "Debug::Acquire::ftp" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:593 +#: apt.conf.5.xml:636 #, fuzzy 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:600 +#: apt.conf.5.xml:643 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "Debug::Acquire::http" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:604 +#: apt.conf.5.xml:647 #, fuzzy 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:611 +#: apt.conf.5.xml:654 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "Debug::Acquire::https" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:615 +#: apt.conf.5.xml:658 #, fuzzy msgid "Print information related to downloading packages using HTTPS." msgstr "" "Affiche les informations concernant le téléchargement de paquets par HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:622 +#: apt.conf.5.xml:665 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "Debug::Acquire::gpgv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:669 #, fuzzy msgid "" "Print information related to verifying cryptographic signatures using " @@ -7049,13 +7139,13 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:633 +#: apt.conf.5.xml:676 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "Debug::aptcdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:680 #, fuzzy msgid "" "Output information about the process of accessing collections of packages " @@ -7065,13 +7155,13 @@ msgstr "" "stockées sur cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:644 +#: apt.conf.5.xml:687 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "Debug::BuildDeps" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:690 #, fuzzy msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" @@ -7079,13 +7169,13 @@ msgstr "" "paquets source ( « build-dependencies » ) par &apt-get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:697 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "Debug::Hashes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:700 #, fuzzy msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" @@ -7095,13 +7185,13 @@ msgstr "" "librairies APT." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:664 +#: apt.conf.5.xml:707 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "Debug::IdentCdrom" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:710 #, fuzzy msgid "" "Do not include information from <literal>statfs</literal>, namely the number " @@ -7113,13 +7203,13 @@ msgstr "" "sur le système de fichier du cédérom." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:718 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "Debug::NoLocking" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:721 #, fuzzy msgid "" "Disable all file locking. For instance, this will allow two instances of " @@ -7129,13 +7219,13 @@ msgstr "" "deux instances de « apt-get update » en même temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:686 +#: apt.conf.5.xml:729 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "Debug::pkgAcquire" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:733 #, fuzzy msgid "Log when items are added to or removed from the global download queue." msgstr "" @@ -7143,13 +7233,13 @@ msgstr "" "téléchargement." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:697 +#: apt.conf.5.xml:740 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "Debug::pkgAcquire::Auth" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:743 #, fuzzy msgid "" "Output status messages and errors related to verifying checksums and " @@ -7160,13 +7250,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:750 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "Debug::pkgAcquire::Diffs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:753 #, fuzzy msgid "" "Output information about downloading and applying package index list diffs, " @@ -7177,13 +7267,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:718 +#: apt.conf.5.xml:761 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "Debug::pkgAcquire::RRed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:722 +#: apt.conf.5.xml:765 #, fuzzy msgid "" "Output information related to patching apt package lists when downloading " @@ -7194,13 +7284,13 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:729 +#: apt.conf.5.xml:772 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "Debug::pkgAcquire::Worker" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:733 +#: apt.conf.5.xml:776 #, fuzzy msgid "" "Log all interactions with the sub-processes that actually perform downloads." @@ -7209,13 +7299,13 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:783 #, fuzzy msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "Debug::pkgAcquire::pkgAutoRemove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:787 #, fuzzy msgid "" "Log events related to the automatically-installed status of packages and to " @@ -7225,13 +7315,13 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:751 +#: apt.conf.5.xml:794 #, fuzzy msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:754 +#: apt.conf.5.xml:797 #, fuzzy msgid "" "Generate debug messages describing which packages are being automatically " @@ -7247,13 +7337,13 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:808 #, fuzzy msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "Debug::pkgDepCache::AutoInstall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:811 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7270,13 +7360,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:830 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "Debug::pkgInitConfig" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:833 #, fuzzy msgid "Dump the default configuration to standard error on startup." msgstr "" @@ -7284,13 +7374,13 @@ msgstr "" "standard." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:840 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "Debug::pkgDPkgPM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:843 #, fuzzy msgid "" "When invoking &dpkg;, output the precise command line with which it is being " @@ -7300,13 +7390,13 @@ msgstr "" "arguments sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:808 +#: apt.conf.5.xml:851 #, fuzzy msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "Debug::pkgDPkgProgressReporting" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:854 #, fuzzy msgid "" "Output all the data received from &dpkg; on the status file descriptor and " @@ -7317,13 +7407,13 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:818 +#: apt.conf.5.xml:861 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "Debug::pkgOrderList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:865 #, fuzzy msgid "" "Generate a trace of the algorithm that decides the order in which " @@ -7333,38 +7423,38 @@ msgstr "" "APT passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:830 +#: apt.conf.5.xml:873 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "Debug::pkgPackageManager" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:877 #, fuzzy 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:841 +#: apt.conf.5.xml:884 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "Debug::pkgPolicy" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:845 +#: apt.conf.5.xml:888 #, fuzzy msgid "Output the priority of each package list on startup." msgstr "Au lancement, affiche la priorité de chaque liste de paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:894 #, fuzzy msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:898 #, fuzzy msgid "" "Trace the execution of the dependency resolver (this applies only to what " @@ -7374,13 +7464,13 @@ 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:863 +#: apt.conf.5.xml:906 #, fuzzy msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "Debug::pkgProblemResolver" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:866 +#: apt.conf.5.xml:909 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 " @@ -7388,13 +7478,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:917 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "Debug::sourceList" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:921 #, fuzzy msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." @@ -7404,7 +7494,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:900 +#: apt.conf.5.xml:943 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -7414,7 +7504,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:907 +#: apt.conf.5.xml:950 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7422,7 +7512,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:912 +#: apt.conf.5.xml:955 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@ -9186,6 +9276,10 @@ msgstr "" msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" +#, fuzzy +#~ msgid "NoConfigure" +#~ msgstr "Immediate-Configure" + #~ msgid "<filename>/etc/apt/sources.list</filename>" #~ msgstr "<filename>/etc/apt/sources.list</filename>" diff --git a/doc/po/ja.po b/doc/po/ja.po index 1e09006f9..7cae35b6e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-12 12:51+0300\n" +"POT-Creation-Date: 2009-09-15 22:56+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1928,7 +1928,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:905 apt_preferences.5.xml:615 +#: apt.conf.5.xml:948 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1942,7 +1942,7 @@ msgstr "" #: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:911 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:954 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" @@ -3630,7 +3630,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:899 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:942 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -6853,7 +6853,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:468 -msgid "dpkg trigger usage" +msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> @@ -6861,10 +6861,10 @@ msgstr "" msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " -"in between his own run. Activating these options can therefore descrease the " +"in between his own run. Activating these options can therefore decrease the " "time needed to perform the install / upgrade. Note that it is intended to " "activate these options per default in the future, but as it changes the way " -"apt calling dpkg drastical it needs a lot more testing. <emphasis>These " +"APT calling dpkg drastical it needs a lot more testing. <emphasis>These " "options are therefore currently experimental and should not be used in " "productive environments.</emphasis> Also it breaks the progress reporting so " "all frontends will currently stay around half (or more) of the time in the " @@ -6872,33 +6872,37 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:483 +#: apt.conf.5.xml:484 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" -"DPkg::NoConfigure \"true\";\n" -"DPkg::ConfigurePending \"true\";" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";\n" +"OrderList::Score::Immediate 100;" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:478 msgid "" -"If you have understand the current risks and problems with these options, " -"but want to help testing them create a new configuration file with the " -"following three options activated. Please report any bugs and problems you " -"encounter and make sure to note that you have used these options in the " +"Note that it is not garanteed that APT will support these options or that " +"these options will not cause (big) trouble in the future. If you have " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " "reports. Asking dpkg for help could also be useful for debugging proposes, " -"see e.g. <command>dpkg --audit</command>. <placeholder type=\"literallayout" -"\" id=\"0\"/>" +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:489 -msgid "NoTriggers" +#: apt.conf.5.xml:491 +msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:492 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6909,48 +6913,134 @@ msgid "" "dpkg - now apt will add these flag also to the unpack and remove calls." msgstr "" -# type: Content of: <refentry><refnamediv><refname> +# type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:499 #, fuzzy -msgid "NoConfigure" -msgstr "config-files" +#| msgid "Packages::Compress" +msgid "PackageManager::Configure" +msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:500 msgid "" -"Set this option to true will prevent apt to call explicit the configuration " -"for all packages. The packages will only be called to unpack (or remove), so " -"dpkg can handle the configuration process. Activating this option will " -"implicit activate also the next option per default as otherwise the system " -"could end in an unconfigured status which could be unbootable!" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally relay on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicit activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:504 +#: apt.conf.5.xml:510 #, fuzzy -msgid "ConfigurePending" +msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:511 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " -"option is activated automatic per default if <literal>NoConfigure</literal> " -"is set, but deactivating could be useful if you want to run APT multiple " -"times in a row - e.g. in an installer. In this sceneries you should " -"deactivate this option in all but the last run." +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In this sceneries " +"you could deactivate this option in all but the last run." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:517 +msgid "DPkg::TriggersPending" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:518 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> 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." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:523 +msgid "Dpkg::NoConfTriggers" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:524 +msgid "" +"DPkg currently will ignore the --triggers or --no-triggers flag if the " +"trigger is already pending. This option therefore has no real effect as long " +"as dpkg doesn't change his behavior. The option is automatical activated if " +"<literal>DPkg::NoTriggers</literal> is activated. You should use " +"<literal>DPkg::TriggersPending</literal> to take care of these pending " +"triggers." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:530 +msgid "PackageManager::UnpackAll" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:531 +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-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"verious steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:538 +msgid "OrderList::Score::Immediate" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:546 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:539 +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 " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relativly low (a package which has a Pre-Depends is higher " +"rated). These option and the others in the same group can be used to change " +"the scoring. The following example shows the settings with there default " +"values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:559 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:560 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6964,12 +7054,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:525 +#: apt.conf.5.xml:568 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:570 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6980,7 +7070,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:581 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6991,7 +7081,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:589 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7002,7 +7092,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:555 +#: apt.conf.5.xml:598 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7012,66 +7102,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:563 +#: apt.conf.5.xml:606 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:573 +#: apt.conf.5.xml:616 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:621 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:582 +#: apt.conf.5.xml:625 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:589 +#: apt.conf.5.xml:632 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:593 +#: apt.conf.5.xml:636 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:643 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:604 +#: apt.conf.5.xml:647 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:611 +#: apt.conf.5.xml:654 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:615 +#: apt.conf.5.xml:658 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:622 +#: apt.conf.5.xml:665 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:626 +#: apt.conf.5.xml:669 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7079,46 +7169,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:633 +#: apt.conf.5.xml:676 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:637 +#: apt.conf.5.xml:680 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:644 +#: apt.conf.5.xml:687 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:647 +#: apt.conf.5.xml:690 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:654 +#: apt.conf.5.xml:697 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:700 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:664 +#: apt.conf.5.xml:707 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:710 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 " @@ -7126,93 +7216,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:675 +#: apt.conf.5.xml:718 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:721 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:686 +#: apt.conf.5.xml:729 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:690 +#: apt.conf.5.xml:733 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:697 +#: apt.conf.5.xml:740 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:700 +#: apt.conf.5.xml:743 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:707 +#: apt.conf.5.xml:750 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:710 +#: apt.conf.5.xml:753 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:718 +#: apt.conf.5.xml:761 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:722 +#: apt.conf.5.xml:765 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:729 +#: apt.conf.5.xml:772 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:733 +#: apt.conf.5.xml:776 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:740 +#: apt.conf.5.xml:783 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:744 +#: apt.conf.5.xml:787 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:751 +#: apt.conf.5.xml:794 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:754 +#: apt.conf.5.xml:797 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7222,12 +7312,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:765 +#: apt.conf.5.xml:808 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:768 +#: apt.conf.5.xml:811 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7244,91 +7334,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:787 +#: apt.conf.5.xml:830 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:833 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:797 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:843 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:808 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:811 +#: apt.conf.5.xml:854 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:818 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:865 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:830 +#: apt.conf.5.xml:873 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:877 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:841 +#: apt.conf.5.xml:884 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:845 +#: apt.conf.5.xml:888 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:894 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:855 +#: apt.conf.5.xml:898 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:863 +#: apt.conf.5.xml:906 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:866 +#: apt.conf.5.xml:909 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 " @@ -7336,12 +7426,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:917 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:878 +#: apt.conf.5.xml:921 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7349,7 +7439,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:900 +#: apt.conf.5.xml:943 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7359,7 +7449,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:907 +#: apt.conf.5.xml:950 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7368,7 +7458,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:912 +#: apt.conf.5.xml:955 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -9122,6 +9212,11 @@ msgstr "" msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" +# type: Content of: <refentry><refnamediv><refname> +#, fuzzy +#~ msgid "NoConfigure" +#~ msgstr "config-files" + # type: Content of: <refentry><refsect1><para> #~ msgid "<filename>/etc/apt/sources.list</filename>" #~ msgstr "<filename>/etc/apt/sources.list</filename>" diff --git a/po/apt-all.pot b/po/apt-all.pot index d4b0d2542..bb3f07904 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-09 15:01+0200\n" +"POT-Creation-Date: 2009-09-15 22:58+0200\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" @@ -2292,7 +2292,7 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:426 +#: apt-pkg/packagemanager.cc:436 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2666,12 +2666,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:662 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Removing %s" msgstr "" @@ -2681,56 +2681,56 @@ msgstr "" msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:554 +#: apt-pkg/deb/dpkgpm.cc:557 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:648 +#: apt-pkg/deb/dpkgpm.cc:653 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:649 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:659 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:656 +#: apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:666 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:663 +#: apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:673 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:669 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:849 +#: apt-pkg/deb/dpkgpm.cc:863 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:877 +#: apt-pkg/deb/dpkgpm.cc:891 msgid "Running dpkg" msgstr "" -- cgit v1.2.3-70-g09d2 From 73b1d4847befc0d3042b6689484e0f74667aba6e Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 16 Sep 2009 22:55:29 +0200 Subject: Drop de and pl "translations" of manpages --- debian/changelog | 3 + doc/de/apt.de.8 | 51 ---------- doc/pl/makefile | 11 --- doc/pl/offline.pl.sgml | 252 ------------------------------------------------- 4 files changed, 3 insertions(+), 314 deletions(-) delete mode 100644 doc/de/apt.de.8 delete mode 100644 doc/pl/makefile delete mode 100644 doc/pl/offline.pl.sgml (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 48768ad88..ac97dfc1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,9 @@ apt (0.7.24) UNRELEASED; urgency=low * doc/fr/*, doc/po/fr.po: - remove the old fr man page translation and replace it with the new po4a-powered translation + * doc/pl, doc/de: dropped (pl translation is useless as the translated + document is not provideed anymore and the de translation is too + incomplete to be used) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/de/apt.de.8 b/doc/de/apt.de.8 deleted file mode 100644 index 5d4914464..000000000 --- a/doc/de/apt.de.8 +++ /dev/null @@ -1,51 +0,0 @@ -.\" This manpage is copyright (C) 1998 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public -.\" License along with APT; if not, write to the Free Software -.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -.\" 02111-1307 USA -.TH apt 8 "14 April 2004" "Debian GNU/Linux" -.\" -.\" Translated into german by Helge Kreutzmann <kreutzm@itp.uni-hannover.de> -.SH NAME -apt \- Fortschrittliches Paketverwaltungswerkzeug -.SH ZUSAMMENFASSUNG -.B apt -.SH BESCHREIBUNG -APT ist eine Verwaltungssystem fr Software-Pakete. Es befindet -sich noch in der Entwicklung; die todschicken Oberflchen sind noch nicht -verfgbar. In der Zwischenzeit lesen Sie bitte -.BR apt-get (8). -.SH OPTIONEN -Keine. -.SH DATEIEN -Keine. -.SH SIEHE AUCH -.BR apt-cache (8), -.BR apt-get (8), -.BR apt.conf (5), -.BR sources.list (5) -.SH DIAGNOSTIK -apt liefert Null bei normaler Funktion, dezimal 100 im Fehlerfall. -.SH FEHLER -Diese Handbuchseite wurde noch nicht mal begonnen. -.PP -Siehe <http://bugs.debian.org/apt>. Falls Sie einen Fehler in -.BR apt -melden wollen, lesen Sie bitte -.I /usr/share/doc/debian/bug-reporting.txt -oder verwenden Sie das -.BR reportbug (1) -Kommando. -.SH AUTOR -apt wurde vom APT-Team <apt@packages.debian.org> geschrieben. diff --git a/doc/pl/makefile b/doc/pl/makefile deleted file mode 100644 index 94939e156..000000000 --- a/doc/pl/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/pl - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Debian Doc SGML Documents -SOURCE = offline.pl.sgml -DEBIANDOC_HTML_OPTIONS=-l pl -include $(DEBIANDOC_H) diff --git a/doc/pl/offline.pl.sgml b/doc/pl/offline.pl.sgml deleted file mode 100644 index 0d301d4fb..000000000 --- a/doc/pl/offline.pl.sgml +++ /dev/null @@ -1,252 +0,0 @@ -<!doctype debiandoc PUBLIC "-//DebianDoc//DTD DebianDoc//EN"> -<!-- -*- mode: sgml; mode: fold -*- --> -<book> -<title>Uywanie APT w trybie offline - -Jason Gunthorpe jgg@debian.org -Polskie tumaczenie Krzysztof Fiertek akfedux@megapolis.pl -$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $ - - -Dokument ten opisuje uywanie programu APT w rodowiskach pozbawionych dostpu, -do sieci, a w szczeglnoci metod pozwalajc na robienie aktualizacji systemu. - - - -Copyright © Jason Gunthorpe, 1999. -

-Copyright © polskiego tumaczenia Krzysztof Fiertek, 2004. -

-"APT" i ten dokument s oprogramowaniem wolnodostpnym; moesz -rozpowszechnia je i/lub zmienia w zgodzie z postanowieniami -"Oglnej Licencji Publicznej GNU" (GNU General Public License) -takiej, jak zostaa opublikowana przez "Fundacje Wolnego -Oprogramowania (Free Software Foundation); albo w wersji 2 teje -licencji, albo (twj wybr) w dowolnej pniejszej. - -

-Wicej szczegw mona uzyska, przegldajc plik zawierajcy peny tekst -licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL). - - - - -Wstp - - -Wprowadzenie - -

-Normalnie APT wymaga bezporedniego dostpu do archiww Debiana przez -sie lokaln albo przez sie internetow. Kolejn niedogodnoci moe by -fakt, e nasz komputer, ktry pracuje na powolnym czu takim jak modem, -jest znacznie oddalony od innego komputera z szybkim czem. - -

-Rozwizaniem tego problemu jest uycie pojemnych przenonych nonikw -takich jak dyskietka Zip lub dysk SuperDisk. Noniki te nie s -wystarczajco pojemne, by zgromadzi kompletne archiwum Debiana, ale mona -miao dopasowa podzbir duego archiwum wystarczajcy dla wikszoci -uytkownikw. Pomys polega na tym, by uy programu APT do wygenerowania -listy pakietw, ktre s wymagane, a nastpnie pobraniu ich na dysk, uywajc -innego komputera z waciw zwartoci. Jest nawet moliwe, by uy innego -komputera z Debianem z zainstalowanym programem APT lub zupenie innym -systemem operacyjnym i programem narzdziowym do pobierania plikw takim -jak wget. - -

-Osigane jest to przez twrcze manipulowanie plikiem konfiguracyjnym -programu APT. Rzecz niezbdn jest poinformowanie programu APT, aby wskazywa -na dysk z plikami archiwum. Naley zauway, e dysk powinien by -sformatowany do obsugi systemu plikw pozwalajcego posugiwa si dugimi -nazwami plikw (np. ext2, fat32 albo vfat). - - - - - -Uywanie programu APT na obu komputerach - - -Wprowadzenie - -

-APT bdcy do dyspozycji na obu komputerach daje najprostsz kombinacj. -Zasadniczym pomysem tej metody jest umieszczenie kopii pliku status na dysku -i uycie odlegego komputera, aby uzyska najnowsze pliki pakietw -i zdecydowa, ktre pakiety trzeba pobra. Struktura katalogw na dysku -powinna wyglda nastpujco: - - - /disc/ - archives/ - partial/ - lists/ - partial/ - status - sources.list - apt.conf - - - - - - -Plik konfiguracyjny - -

-Plik konfiguracyjny powinien informowa program APT, aby przechowywa swoje -pliki na dysku, a take uywa plikw konfiguracyjnych z dysku. Plik -sources.list powinien zawiera prawidowe odnoniki, ktrych naley -uy na zdalnym komputerze, a plik status powinien by kopi -/var/lib/dpkg/status. Zauwa, e jeli uywasz lokalnego archiwum -musisz uy tych samych odnonikw o identycznej skadni. - -

-apt.conf musi zawiera niezbdne wpisy, by APT korzysta z dysku: - - - APT - { - /* Ten wpis nie jest wymagany, jeli oba komputery maj t sam - architektur; mwi on programowi APT na komputerze pobierajcym - pakiety, jaka jest architektura naszego komputera */ - Architecture "i386"; - - Get::Download-Only "true"; - }; - - Dir - { - /* Uyj katalogu disc na informacje stanu i przekieruj plik status - z domylnego /var/lib/dpkg */ - State "/disc/"; - State::status "status"; - - // Katalog lokalnie przechowywanych pakietw binarnych - Cache::archives "/disc/archives/"; - - Cache "/tmp/"; - - // Lokalizacja pliku sources.list. - Etc "/disc"; - }; - - -Wicej szczegw mona zobaczy w stronie podrcznika apt.conf i w przykadowym -pliku konfiguracyjnym /usr/share/doc/apt/examples/apt.conf. - -

-Pierwsz rzecz, jak naley zrobi na oddalonym komputerze z Debianem to -zamontowa dysk i przekopiowa na niego plik /var/lib/dpkg/status. -Trzeba take utworzy stuktur katalogw przedstawion we "Wprowadzeniu": -archives/partial/ i lists/partial/. Nastpnie niesiemy -dysk do oddalonego komputera z szybkim czem i konfigurujemy plik -sources.list. Na oddalonym komputerze wykonujemy kolejno: - - - # export APT_CONFIG="/disc/apt.conf" - # apt-get update - [ APT aktualizuje ustawienia ] - # apt-get dist-upgrade - [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ] - - - -Polecenie dist-upgrade mona zastpi kadym innym podstawowym poleceniem -APT, w szczeglnoci dselect-upgrade. Mona nawet uy APT jako metody -dostpu dla dselect. Jednak stworzy to problem w przeniesieniu -Twoich operacji wyborw z powrotem na lokalny komputer. - -

-W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa -niezbdne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do -siebie i wpisujemy: - - - # export APT_CONFIG="/disc/apt.conf" - # apt-get check - [ APT tworzy lokaln kopi plikw cache ] - # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade - [ Moe te by inne polecenie programu APT ] - - -

-Do prawidowego dziaania koniecznie naley poda plik status z lokalnej -maszyny. To jest bardzo wane! - -

-Jeli uywasz dselect, moesz wykona bardzo ryzykown operacj skopiowania -disc/status do /var/lib/dpkg/status, tak e wszystkie zmiany, ktrych -dokonae na odlegym komputerze, bd przeniesione. Mocno zalecam, aby -dokonywa doboru pakietw tylko na lokalnym komputerze, ale nie zawsze -jest to moliwe. NIE podmieniaj pliku status, jeli dpkg lub APT byy -uruchamiane w midzyczasie!! - - - - -Uywanie programw APT i wget - - -Wprowadzenie - -

-wget jest popularnym i przenonym programem narzdziowym -pobierania plikw, ktry dziaa prawie na kadym komputerze. -W przeciwiestwie do metody opisanej powyej ta wymaga, aby na lokalnym komputerze -bya aktualna lista dostpnych pakietw. - -

-Naley stworzy katalog disc tylko na pakiety do pobrania z innego -komputera. Uyta zostanie do tego opcja --print-uris programu apt-get, -a nastpnie przygotujemy skrypt dla programu wget, ktry pobierze waciwe -pakiety. - - - - - -Kolejne kroki - -

-W odrnieniu od poprzedniej metody dziaania ta nie wymaga specjalnych -plikw konfiguracyjnych. Uywamy jedynie podstawowych polece APT, by -wygenerowa list plikw. - - - # apt-get dist-upgrade - [ Wybierz "no" po znaku zachty, upewnij si, czy to waciwy wybr ] - # apt-get -qq --print-uris dist-upgrade > uris - # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script - - -Take inne opcje ni dist-upgrade mog tu by uyte, wczajc -dselect-upgrade. - -

-Plik skryptu /disc/wget-script bdzie teraz zawiera list wywoa programu -wget, niezbdnych do pobrania potrzebnych archiww. -Skrypt ten naley uruchomi w biecym katalogu o punkcie montowania disc, -tak aby tu zapisywa dane na dysku. - -

-Na oddalonym komputerze naley wykona co takiego - - - # cd /disc - # sh -x ./wget-script - [ czekaj.. ] - - -Gdy archiwa zostan pobrane i dysk wrci do komputera z Debianem, -instalowanie mona prowadzi dalej poleceniem: - - - # apt-get -o dir::cache::archives="/disc/" dist-upgrade - - -ktre uyje pobranych uprzednio archiww z dysku. - - - -- cgit v1.2.3-70-g09d2 From 4e5500361a964f49656a39b001ba246f113f8cdd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Sep 2009 09:30:17 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - when tcgetattr() returns non-zero skip all pty magic (thanks to Simon Richter, closes: #509866) --- apt-pkg/deb/dpkgpm.cc | 51 +++++++++++++++++++++++++++------------------------ debian/changelog | 8 ++++++++ 2 files changed, 35 insertions(+), 24 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index f787f365e..ab71d4e96 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -809,32 +809,35 @@ bool pkgDPkgPM::Go(int OutStatusFd) struct termios tt; struct winsize win; - int master; - int slave; + int master = -1; + int slave = -1; - // FIXME: setup sensible signal handling (*ick*) - tcgetattr(0, &tt); - ioctl(0, TIOCGWINSZ, (char *)&win); - if (openpty(&master, &slave, NULL, &tt, &win) < 0) + // if tcgetattr does not return zero there was a error + // and we do not do any pty magic + if (tcgetattr(0, &tt) == 0) { - const char *s = _("Can not write log, openpty() " - "failed (/dev/pts not mounted?)\n"); - fprintf(stderr, "%s",s); - fprintf(term_out, "%s",s); - master = slave = -1; - } else { - struct termios rtt; - rtt = tt; - cfmakeraw(&rtt); - rtt.c_lflag &= ~ECHO; - // block SIGTTOU during tcsetattr to prevent a hang if - // the process is a member of the background process group - // http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGTTOU); - sigprocmask(SIG_BLOCK,&sigmask, &original_sigmask); - tcsetattr(0, TCSAFLUSH, &rtt); - sigprocmask(SIG_SETMASK, &original_sigmask, 0); + ioctl(0, TIOCGWINSZ, (char *)&win); + if (openpty(&master, &slave, NULL, &tt, &win) < 0) + { + const char *s = _("Can not write log, openpty() " + "failed (/dev/pts not mounted?)\n"); + fprintf(stderr, "%s",s); + fprintf(term_out, "%s",s); + master = slave = -1; + } else { + struct termios rtt; + rtt = tt; + cfmakeraw(&rtt); + rtt.c_lflag &= ~ECHO; + // block SIGTTOU during tcsetattr to prevent a hang if + // the process is a member of the background process group + // http://www.opengroup.org/onlinepubs/000095399/functions/tcsetattr.html + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGTTOU); + sigprocmask(SIG_BLOCK,&sigmask, &original_sigmask); + tcsetattr(0, TCSAFLUSH, &rtt); + sigprocmask(SIG_SETMASK, &original_sigmask, 0); + } } // Fork dpkg diff --git a/debian/changelog b/debian/changelog index 6692191d1..a27f958b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.22.4) unstable; urgency=low + + * apt-pkg/deb/dpkgpm.cc: + - when tcgetattr() returns non-zero skip all pty magic + (thanks to Simon Richter, closes: #509866) + + -- Michael Vogt Mon, 31 Aug 2009 11:08:03 +0200 + apt (0.7.22.3) UNRELEASED; urgency=low [ Eugene V. Lyubimkin ] -- cgit v1.2.3-70-g09d2 From 07b2db9b4b2e543b599db97d75ac2315a1676ad8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Sep 2009 09:32:20 +0200 Subject: * apt-inst/contrib/arfile.cc: - show propper error message for Invalid archive members --- apt-inst/contrib/arfile.cc | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc index 7c85f2e86..8f30355ed 100644 --- a/apt-inst/contrib/arfile.cc +++ b/apt-inst/contrib/arfile.cc @@ -87,7 +87,7 @@ bool ARArchive::LoadHeaders() StrToNum(Head.Size,Memb->Size,sizeof(Head.Size)) == false) { delete Memb; - return _error->Error(_("Invalid archive member header")); + return _error->Error(_("Invalid archive member header %s"), Head.Name); } // Check for an extra long name string diff --git a/debian/changelog b/debian/changelog index a27f958b9..cad223833 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.22.4) unstable; urgency=low * apt-pkg/deb/dpkgpm.cc: - when tcgetattr() returns non-zero skip all pty magic (thanks to Simon Richter, closes: #509866) + * apt-inst/contrib/arfile.cc: + - show propper error message for Invalid archive members -- Michael Vogt Mon, 31 Aug 2009 11:08:03 +0200 -- cgit v1.2.3-70-g09d2 From 364af2ef2aba2911b12379ec8b6e55874e4b0a31 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 24 Sep 2009 11:55:46 +0200 Subject: * cmdline/apt-key: - Emit a warning if removed keys keyring is missing and skip associated checks (LP: #218971) --- cmdline/apt-key | 18 +++++++++++------- debian/changelog | 6 ++++++ 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-key b/cmdline/apt-key index 7bb30240e..5f4e02fdf 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -93,13 +93,17 @@ update() { # add any security. we *need* this check on net-update though $GPG_CMD --quiet --batch --keyring $ARCHIVE_KEYRING --export | $GPG --import - # remove no-longer supported/used keys - keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` - for key in $keys; do - if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then - $GPG --quiet --batch --delete-key --yes ${key} - fi - done + if [ -r "$REMOVED_KEYS" ]; then + # remove no-longer supported/used keys + keys=`$GPG_CMD --keyring $REMOVED_KEYS --with-colons --list-keys | grep ^pub | cut -d: -f5` + for key in $keys; do + if $GPG --list-keys --with-colons | grep ^pub | cut -d: -f5 | grep -q $key; then + $GPG --quiet --batch --delete-key --yes ${key} + fi + done + else + echo "Warning: removed keys keyring $REMOVED_KEYS missing or not readable" >&2 + fi } diff --git a/debian/changelog b/debian/changelog index cad223833..16e8929ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ apt (0.7.22.4) unstable; urgency=low + [ Michael Vogt ] * apt-pkg/deb/dpkgpm.cc: - when tcgetattr() returns non-zero skip all pty magic (thanks to Simon Richter, closes: #509866) * apt-inst/contrib/arfile.cc: - show propper error message for Invalid archive members + [ Loïc Minier ] + * cmdline/apt-key: + - Emit a warning if removed keys keyring is missing and skip associated + checks (LP: #218971) + -- Michael Vogt Mon, 31 Aug 2009 11:08:03 +0200 apt (0.7.22.3) UNRELEASED; urgency=low -- cgit v1.2.3-70-g09d2 From 5900bd8dd90ebe61697a82fc18f3b1a9edaeedfa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 24 Sep 2009 12:17:34 +0200 Subject: document the Acquire::http::Dl-Limit option in the manpage --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 90e5f8de1..4bf132367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. + * doc/apt.conf.5.xml: + - document the Acquire::http::Dl-Limit option * doc/apt.ent, all man pages: - move the description of files to globally usable entities * doc/apt_preferences.5.xml: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 67aa933cc..11c086bf2 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -227,7 +227,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; 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. + require this are in violation of RFC 2068. + + The used bandwidth can be limited with Acquire::http::Dl-Limit + which accepts integer values in kilobyte. The default value is 0 which deactivates + the limit and tries uses as much as possible of the bandwith (Note that this option implicit + deactivates the download from multiple servers at the same time.) https -- cgit v1.2.3-70-g09d2 From 3ba36dfffbf5f158090f53a15b94e67db98057aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 24 Sep 2009 12:18:16 +0200 Subject: clarify the note for the pkgnames command in the manpage (Closes: #547599) --- debian/changelog | 2 ++ doc/apt-cache.8.xml | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4bf132367..e21ed2dfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.conf.5.xml: - document the Acquire::http::Dl-Limit option + * doc/apt-cache.8.xml: + - clarify the note for the pkgnames command (Closes: #547599) * doc/apt.ent, all man pages: - move the description of files to globally usable entities * doc/apt_preferences.5.xml: diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 26d55a519..9851135b1 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -226,11 +226,14 @@ Reverse Provides: pkgnames [ prefix ] - This command prints the name of each package in the system. The optional + 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 extremely quickly. This command is best used with the - option. + option. + Note that a package which APT knows of is not nessasarily available to download, + installable or installed, e.g. virtual packages are also listed in the generated list. + dotty pkg(s) -- cgit v1.2.3-70-g09d2 From 96bc713cb6f2b5442700a40a64f1c6315942d82a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 24 Sep 2009 12:19:42 +0200 Subject: add bugnr to the fix two little typos in the --simulate description. (Closes: #545059) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The double spaces are not a bug of APT nor one of po4a. Thanks to Nicolas François for the explaination! --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e21ed2dfd..5a9001658 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,7 +23,7 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/contrib/strutl.cc: - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208) * doc/apt-get.8.xml: - - fix two little typos in the --simulate description. + - fix two little typos in the --simulate description. (Closes: #545059) * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml: - add an order subgroup to the compression types to simplify reordering a bit and improve the documentation for this option group. -- cgit v1.2.3-70-g09d2 From 5e62aac041d57ecbfd07c7e1ec7822d5fbbba522 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 24 Sep 2009 12:58:38 +0200 Subject: When selecting a real package instead of a virtual one, ignore versions for the same package that are not candidates. This allows us to survive repositories that contain more than one version of a package. Bugreport #547788 and patch by Marius Vollmer, thanks! --- cmdline/apt-get.cc | 43 ++++++++++++++++++++++++++++++++++--------- debian/changelog | 3 +++ 2 files changed, 37 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 1582fff85..c32d67226 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1049,17 +1049,42 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, pkgProblemResolver &Fix,bool Remove,bool BrokenFix, unsigned int &ExpectedInst,bool AllowFail = true) { - /* This is a pure virtual package and there is a single available - provides */ - if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0 && - Pkg.ProvidesList()->NextProvides == 0) + /* This is a pure virtual package and there is a single available + candidate providing it. */ + if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0) { - pkgCache::PkgIterator Tmp = Pkg.ProvidesList().OwnerPkg(); - ioprintf(c1out,_("Note, selecting %s instead of %s\n"), - Tmp.Name(),Pkg.Name()); - Pkg = Tmp; + pkgCache::PkgIterator Prov; + bool found_one = false; + + for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; P++) + { + pkgCache::VerIterator const PVer = P.OwnerVer(); + pkgCache::PkgIterator const PPkg = PVer.ParentPkg(); + + /* Ignore versions that are not a candidate. */ + if (Cache[PPkg].CandidateVer != PVer) + continue; + + if (found_one == false) + { + Prov = PPkg; + found_one = true; + } + else if (PPkg != Prov) + { + found_one = false; // we found at least two + break; + } + } + + if (found_one == true) + { + ioprintf(c1out,_("Note, selecting %s instead of %s\n"), + Prov.Name(),Pkg.Name()); + Pkg = Prov; + } } - + // Handle the no-upgrade case if (_config->FindB("APT::Get::upgrade",true) == false && Pkg->CurrentVer != 0) diff --git a/debian/changelog b/debian/changelog index 5a9001658..dd56495b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,9 @@ apt (0.7.24) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc: - add and document _experimental_ options to make (aggressive) use of dpkg's trigger and configuration handling (Closes: #473461) + * cmdline/apt-get.cc: + - ignore versions that are not candidates when selecting a package + instead of a virtual one (by Marius Vollmer, Closes: #547788) [ Christian Perrier ] * doc/fr/*, doc/po/fr.po: -- cgit v1.2.3-70-g09d2 From 63fc55509fc32466b1027e9e91cc3220ee21a1e0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 24 Sep 2009 15:03:55 +0200 Subject: try to be cristal clear about the usage of :: and {} (Closes: #503481) See the bugreport (and merged ones) for discussion details which lead to these additions to the introduction of the apt.conf manpage. --- debian/changelog | 1 + doc/apt.conf.5.xml | 29 ++- doc/po/apt-doc.pot | 514 +++++++++++++++++++++++++++----------------------- doc/po/fr.po | 535 +++++++++++++++++++++++++++++----------------------- doc/po/ja.po | 537 ++++++++++++++++++++++++++++++----------------------- 5 files changed, 919 insertions(+), 697 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dd56495b2..22f83a4dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.conf.5.xml: - document the Acquire::http::Dl-Limit option + - try to be cristal clear about the usage of :: and {} (Closes: #503481) * doc/apt-cache.8.xml: - clarify the note for the pkgnames command (Closes: #547599) * doc/apt.ent, all man pages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 11c086bf2..cfc09ec1f 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -86,17 +86,40 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The names of the configuration items are not case-sensitive. So in the previous example you could use dpkg::pre-install-pkgs. - Two specials are allowed, #include and #clear + Names for the configuration items are optional if a list is defined as it can be see in + the DPkg::Pre-Install-Pkgs example above. If you don't specify a name a + new entry will simply add a new option to the list. If you specify a name you can override + the option as every other option by reassigning a new value to the option. + + Two specials are allowed, #include and #clear: #include will include the given file, unless the filename ends in a slash, then the whole directory is included. #clear is used to erase a part of the configuration tree. The - specified element and all its descendants are erased. + specified element and all its descendants are erased. + (Note that these lines also need to end with a semicolon.) + + The #clear command is the only way to delete a list or a complete scope. + Reopening a scope or the ::-style described below will not + override previewsly written entries. Only options can be overridden by adressing a new + value to it - lists and scopes can't be overridden, only cleared. 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 (APT::Get::Assume-Yes 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. + a trailing :: to the list name. (As you might suspect: The scope syntax can't be used + on the commandline.) + + 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 acts like every other option with a name. These introduces many problems + including that a user who writes multiple lines in this wrong syntax in + the hope to append to a list will gain the opposite as only the last assignment for this option + "::" 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. The APT Group diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index a624f49c0..ddd9d025e 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-18 17:15+0300\n" +"POT-Creation-Date: 2009-09-24 15:02+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1126,20 +1126,28 @@ msgstr "" #. type: Content of: #: apt-cache.8.xml:229 msgid "" -"This command prints the name of each package in the system. The optional " +"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 " "extremely quickly. This command is best used with the " " option." msgstr "" +#. type: Content of: +#: apt-cache.8.xml:234 +msgid "" +"Note that a package which APT knows of is not nessasarily available to " +"download, installable or installed, e.g. virtual packages are also listed in " +"the generated list." +msgstr "" + #. type: Content of: -#: apt-cache.8.xml:236 +#: apt-cache.8.xml:239 msgid "dotty pkg(s)" msgstr "" #. type: Content of: -#: apt-cache.8.xml:237 +#: apt-cache.8.xml:240 msgid "" "dotty takes a list of packages on the command line and " "generates output suitable for use by dotty from the -#: apt-cache.8.xml:246 +#: apt-cache.8.xml:249 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1161,17 +1169,17 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:251 +#: apt-cache.8.xml:254 msgid "Caution, dotty cannot graph larger sets of packages." msgstr "" #. type: Content of: -#: apt-cache.8.xml:254 +#: apt-cache.8.xml:257 msgid "xvcg pkg(s)" msgstr "" #. type: Content of: -#: apt-cache.8.xml:255 +#: apt-cache.8.xml:258 msgid "" "The same as dotty, only for xvcg from the VCG " @@ -1179,12 +1187,12 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:259 +#: apt-cache.8.xml:262 msgid "policy [ pkg(s) ]" msgstr "" #. type: Content of: -#: apt-cache.8.xml:260 +#: apt-cache.8.xml:263 msgid "" "policy is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " @@ -1193,12 +1201,12 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:266 +#: apt-cache.8.xml:269 msgid "madison /[ pkg(s) ]" msgstr "" #. type: Content of: -#: apt-cache.8.xml:267 +#: apt-cache.8.xml:270 msgid "" "apt-cache's madison command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1210,22 +1218,22 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:278 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:408 apt.conf.5.xml:430 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 msgid "options" msgstr "" #. type: Content of: -#: apt-cache.8.xml:282 +#: apt-cache.8.xml:285 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:282 +#: apt-cache.8.xml:285 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:286 msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: " @@ -1233,17 +1241,17 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:291 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:292 msgid "" "Select the file to store the source cache. The source is used only by " "gencaches and it stores a parsed version of the package " @@ -1253,17 +1261,17 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:300 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " @@ -1272,17 +1280,17 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:306 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:306 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:304 +#: apt-cache.8.xml:307 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1290,34 +1298,34 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333 +#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:309 +#: apt-cache.8.xml:312 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:310 +#: apt-cache.8.xml:313 msgid "" "Print full package records when searching. Configuration Item: " "APT::Cache::ShowFull." msgstr "" #. type: Content of: -#: apt-cache.8.xml:314 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:314 +#: apt-cache.8.xml:317 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:315 +#: apt-cache.8.xml:318 msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use . If " @@ -1328,17 +1336,17 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:326 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:326 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:324 +#: apt-cache.8.xml:327 msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use " @@ -1347,29 +1355,29 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:332 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:329 apt-cdrom.8.xml:139 +#: apt-cache.8.xml:332 apt-cdrom.8.xml:139 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:330 +#: apt-cache.8.xml:333 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: APT::Cache::NamesOnly." msgstr "" #. type: Content of: -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:337 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:335 +#: apt-cache.8.xml:338 msgid "" "Make pkgnames print all names, including virtual packages " "and missing dependencies. Configuration Item: " @@ -1377,12 +1385,12 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:340 +#: apt-cache.8.xml:343 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:341 +#: apt-cache.8.xml:344 msgid "" "Make depends and rdepends recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1390,12 +1398,12 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:346 +#: apt-cache.8.xml:349 msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:351 msgid "" "Limit the output of depends and " "rdepends to packages which are currently installed. " @@ -1403,37 +1411,37 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:940 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:968 apt_preferences.5.xml:615 msgid "Files" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:360 +#: apt-cache.8.xml:363 msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:366 +#: apt-cache.8.xml:369 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:371 +#: apt-cache.8.xml:374 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -2673,7 +2681,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -4267,43 +4275,81 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:89 msgid "" +"Names for the configuration items are optional if a list is defined as it " +"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example " +"above. If you don't specify a name a new entry will simply add a new option " +"to the list. If you specify a name you can override the option as every " +"other option by reassigning a new value to the option." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 +msgid "" "Two specials are allowed, <literal>#include</literal> and " -"<literal>#clear</literal> <literal>#include</literal> will include the given " -"file, unless the filename ends in a slash, then the whole directory is " +"<literal>#clear</literal>: <literal>#include</literal> will include the " +"given file, unless the filename ends in a slash, then the whole directory is " "included. <literal>#clear</literal> is used to erase a part of the " "configuration tree. The specified element and all its descendants are " -"erased." +"erased. (Note that these lines also need to end with a semicolon.)" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:95 +#: apt.conf.5.xml:101 +msgid "" +"The #clear command is the only way to delete a list or a complete scope. " +"Reopening a scope or the ::-style described below will " +"<emphasis>not</emphasis> override previewsly written entries. Only options " +"can be overridden by adressing a new value to it - lists and scopes can't be " +"overridden, only cleared." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:106 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." +"appended too by adding a trailing :: to the list name. (As you might " +"suspect: The scope syntax can't be used on the commandline.)" +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:113 +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." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:102 +#: apt.conf.5.xml:125 msgid "The APT Group" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:103 +#: apt.conf.5.xml:126 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:107 +#: apt.conf.5.xml:130 msgid "Architecture" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:131 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -4311,12 +4357,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:136 msgid "Default-Release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:114 +#: apt.conf.5.xml:137 msgid "" "Default release to install packages from if more than one version " "available. Contains release name, codename or release version. Examples: " @@ -4325,24 +4371,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:141 msgid "Ignore-Hold" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:119 +#: apt.conf.5.xml:142 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:123 +#: apt.conf.5.xml:146 msgid "Clean-Installed" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:124 +#: apt.conf.5.xml:147 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 " @@ -4351,12 +4397,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:153 msgid "Immediate-Configure" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:154 msgid "" "Disable Immediate Configuration; This dangerous option disables some of " "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " @@ -4366,12 +4412,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:138 +#: apt.conf.5.xml:161 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:162 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 " @@ -4382,87 +4428,87 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:170 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:148 +#: apt.conf.5.xml:171 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:175 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:153 +#: apt.conf.5.xml:176 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:156 +#: apt.conf.5.xml:179 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:180 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:161 +#: apt.conf.5.xml:184 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:162 +#: apt.conf.5.xml:185 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:166 +#: apt.conf.5.xml:189 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:190 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:173 +#: apt.conf.5.xml:196 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:178 +#: apt.conf.5.xml:201 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:179 +#: apt.conf.5.xml:202 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:207 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:185 +#: apt.conf.5.xml:208 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -4472,36 +4518,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:215 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:193 +#: apt.conf.5.xml:216 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:197 +#: apt.conf.5.xml:220 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:221 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:202 sources.list.5.xml:139 +#: apt.conf.5.xml:225 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:203 +#: apt.conf.5.xml:226 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 " @@ -4513,7 +4559,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:234 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 " @@ -4527,7 +4573,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:221 apt.conf.5.xml:273 +#: apt.conf.5.xml:244 apt.conf.5.xml:301 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4535,7 +4581,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:247 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) " @@ -4546,13 +4592,23 @@ msgid "" "are in violation of RFC 2068." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:255 +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 which deactivates the limit and tries uses " +"as much as possible of the bandwith (Note that this option implicit " +"deactivates the download from multiple servers at the same time.)" +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:261 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:262 msgid "" "HTTPS URIs. Cache-control and proxy options are the same as for " "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " @@ -4560,7 +4616,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:266 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4582,12 +4638,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:256 sources.list.5.xml:150 +#: apt.conf.5.xml:284 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:285 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 " @@ -4607,7 +4663,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:276 +#: apt.conf.5.xml:304 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 " @@ -4617,7 +4673,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:311 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4627,7 +4683,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:288 +#: apt.conf.5.xml:316 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4637,18 +4693,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:295 sources.list.5.xml:132 +#: apt.conf.5.xml:323 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:301 +#: apt.conf.5.xml:329 #, no-wrap msgid "\"/cdrom/\"::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:296 +#: apt.conf.5.xml:324 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 " @@ -4661,12 +4717,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:306 +#: apt.conf.5.xml:334 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:307 +#: apt.conf.5.xml:335 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4674,12 +4730,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:340 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:318 +#: apt.conf.5.xml:346 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4687,7 +4743,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:313 +#: apt.conf.5.xml:341 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4699,19 +4755,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:323 +#: apt.conf.5.xml:351 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:354 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:347 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 " @@ -4728,13 +4784,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:358 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:356 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -4749,7 +4805,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:335 +#: apt.conf.5.xml:363 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4759,7 +4815,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:174 +#: apt.conf.5.xml:197 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" " @@ -4767,12 +4823,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:372 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:374 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4784,7 +4840,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:353 +#: apt.conf.5.xml:381 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4797,7 +4853,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:390 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4807,7 +4863,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:396 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 " @@ -4815,7 +4871,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:372 +#: apt.conf.5.xml:400 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -4827,7 +4883,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:408 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4840,12 +4896,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:393 +#: apt.conf.5.xml:421 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:423 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4853,12 +4909,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:399 +#: apt.conf.5.xml:427 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:400 +#: apt.conf.5.xml:428 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 " @@ -4869,50 +4925,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:409 +#: apt.conf.5.xml:437 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:413 +#: apt.conf.5.xml:441 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:442 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:418 +#: apt.conf.5.xml:446 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:447 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:425 +#: apt.conf.5.xml:453 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:454 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:431 +#: apt.conf.5.xml:459 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 " @@ -4920,17 +4976,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:464 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:464 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:465 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 " @@ -4939,12 +4995,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:472 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 " @@ -4954,7 +5010,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:478 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -4965,36 +5021,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:458 +#: apt.conf.5.xml:486 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:462 +#: apt.conf.5.xml:490 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:491 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:468 +#: apt.conf.5.xml:496 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:497 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5009,7 +5065,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5019,7 +5075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:506 msgid "" "Note that it is not garanteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5033,12 +5089,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:518 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5050,12 +5106,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:527 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5072,12 +5128,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:537 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5089,12 +5145,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5104,12 +5160,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:550 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:551 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 " @@ -5121,12 +5177,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:558 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5138,7 +5194,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:559 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 " @@ -5152,12 +5208,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:579 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:580 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5166,12 +5222,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:588 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:590 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5182,7 +5238,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:601 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5190,7 +5246,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:609 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5198,7 +5254,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:618 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5208,110 +5264,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:598 +#: apt.conf.5.xml:626 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:608 +#: apt.conf.5.xml:636 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:641 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:617 +#: apt.conf.5.xml:645 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:624 +#: apt.conf.5.xml:652 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:628 +#: apt.conf.5.xml:656 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:663 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:639 +#: apt.conf.5.xml:667 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:646 +#: apt.conf.5.xml:674 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:650 +#: apt.conf.5.xml:678 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:685 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 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:668 +#: apt.conf.5.xml:696 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 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:679 +#: apt.conf.5.xml:707 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:710 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:689 +#: apt.conf.5.xml:717 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:720 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:699 +#: apt.conf.5.xml:727 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:730 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 " @@ -5319,92 +5375,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:738 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:713 +#: apt.conf.5.xml:741 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:721 +#: apt.conf.5.xml:749 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:753 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:732 +#: apt.conf.5.xml:760 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:735 +#: apt.conf.5.xml:763 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:742 +#: apt.conf.5.xml:770 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:745 +#: apt.conf.5.xml:773 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:753 +#: apt.conf.5.xml:781 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:757 +#: apt.conf.5.xml:785 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:764 +#: apt.conf.5.xml:792 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:768 +#: apt.conf.5.xml:796 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:775 +#: apt.conf.5.xml:803 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:779 +#: apt.conf.5.xml:807 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:786 +#: apt.conf.5.xml:814 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:789 +#: apt.conf.5.xml:817 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5414,12 +5470,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:828 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:803 +#: apt.conf.5.xml:831 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5437,90 +5493,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:850 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:853 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:860 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:835 +#: apt.conf.5.xml:863 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:843 +#: apt.conf.5.xml:871 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:874 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:853 +#: apt.conf.5.xml:881 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:857 +#: apt.conf.5.xml:885 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:865 +#: apt.conf.5.xml:893 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:897 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:876 +#: apt.conf.5.xml:904 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:914 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:918 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:898 +#: apt.conf.5.xml:926 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:929 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 " @@ -5528,32 +5584,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:937 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 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:935 +#: apt.conf.5.xml:963 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:970 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:975 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 6088f9ecf..461638080 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-09-18 17:09+0300\n" +"POT-Creation-Date: 2009-09-24 15:02+0300\n" "PO-Revision-Date: 2009-09-14 20:15+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1515,8 +1515,15 @@ msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:229 +#, fuzzy +#| msgid "" +#| "This command prints the name of each package in the system. The optional " +#| "argument is a prefix match to filter the name list. The output is " +#| "suitable for use in a shell tab complete function and the output is " +#| "generated extremely quickly. This command is best used with the <option>--" +#| "generate</option> option." msgid "" -"This command prints the name of each package in the system. The optional " +"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 " "extremely quickly. This command is best used with the <option>--generate</" @@ -1528,13 +1535,21 @@ msgstr "" "est produite très rapidement. On utilise au mieux cette commande avec " "l'option <option>--generate</option>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:234 +msgid "" +"Note that a package which APT knows of is not nessasarily available to " +"download, installable or installed, e.g. virtual packages are also listed in " +"the generated list." +msgstr "" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:236 +#: apt-cache.8.xml:239 msgid "dotty <replaceable>pkg(s)</replaceable>" msgstr "dotty <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:237 +#: apt-cache.8.xml:240 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." @@ -1556,7 +1571,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:246 +#: apt-cache.8.xml:249 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1571,19 +1586,19 @@ msgstr "" "conflits." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:251 +#: apt-cache.8.xml:254 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:254 +#: apt-cache.8.xml:257 msgid "xvcg <replaceable>pkg(s)</replaceable>" msgstr "xvcg <replaceable>paquet(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:255 +#: apt-cache.8.xml:258 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>." @@ -1593,12 +1608,12 @@ msgstr "" "ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:259 +#: apt-cache.8.xml:262 msgid "policy <replaceable>[ pkg(s) ]</replaceable>" msgstr "policy <replaceable>[ paquet(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:260 +#: apt-cache.8.xml:263 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 " @@ -1611,12 +1626,12 @@ msgstr "" "paquet donné en argument." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:266 +#: apt-cache.8.xml:269 msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" msgstr "madison <replaceable>[ paquet(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:267 +#: apt-cache.8.xml:270 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 " @@ -1636,24 +1651,24 @@ msgstr "" "literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:278 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:408 apt.conf.5.xml:430 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 msgid "options" msgstr "options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:282 +#: apt-cache.8.xml:285 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:282 +#: apt-cache.8.xml:285 msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:283 +#: apt-cache.8.xml:286 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::" @@ -1664,18 +1679,18 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:291 msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:289 +#: apt-cache.8.xml:292 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 " @@ -1691,17 +1706,17 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:297 +#: apt-cache.8.xml:300 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 " @@ -1716,17 +1731,17 @@ msgstr "" "<literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:306 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:306 msgid "<option>--important</option>" msgstr "<option>--important</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:304 +#: apt-cache.8.xml:307 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1737,17 +1752,17 @@ msgstr "" "Élément de configuration : <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333 +#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:309 +#: apt-cache.8.xml:312 msgid "<option>--full</option>" msgstr "<option>--full</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:310 +#: apt-cache.8.xml:313 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1757,17 +1772,17 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:314 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:314 +#: apt-cache.8.xml:317 msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:315 +#: apt-cache.8.xml:318 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-" @@ -1785,17 +1800,17 @@ msgstr "" "<literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:326 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:326 msgid "<option>--generate</option>" msgstr "<option>--generate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:324 +#: apt-cache.8.xml:327 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</" @@ -1807,17 +1822,17 @@ msgstr "" "configuration : <literal>APT::Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:332 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:329 apt-cdrom.8.xml:139 +#: apt-cache.8.xml:332 apt-cdrom.8.xml:139 msgid "<option>-n</option>" msgstr "<option>-n</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:330 +#: apt-cache.8.xml:333 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1827,12 +1842,12 @@ msgstr "" "NamesOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:337 msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:335 +#: apt-cache.8.xml:338 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1843,12 +1858,12 @@ msgstr "" "configuration : <literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:340 +#: apt-cache.8.xml:343 msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:341 +#: apt-cache.8.xml:344 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1860,12 +1875,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:346 +#: apt-cache.8.xml:349 msgid "<option>--installed</option>" msgstr "<option>--installed</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:348 +#: apt-cache.8.xml:351 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1876,46 +1891,46 @@ msgstr "" "Élément de configuration : <literal>APT::Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 #: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:940 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 +#: apt.conf.5.xml:968 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:360 +#: apt-cache.8.xml:363 msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:366 +#: apt-cache.8.xml:369 msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnostique" #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:371 +#: apt-cache.8.xml:374 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -3483,7 +3498,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -5668,6 +5683,16 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:89 +msgid "" +"Names for the configuration items are optional if a list is defined as it " +"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " +"If you don't specify a name a new entry will simply add a new option to the " +"list. If you specify a name you can override the option as every other " +"option by reassigning a new value to the option." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 #, fuzzy #| msgid "" #| "Two specials are allowed, <literal>#include</literal> and " @@ -5678,10 +5703,11 @@ msgstr "" #| "erased." msgid "" "Two specials are allowed, <literal>#include</literal> and <literal>#clear</" -"literal> <literal>#include</literal> will include the given file, unless the " -"filename ends in a slash, then the whole directory is included. " +"literal>: <literal>#include</literal> will include the given file, unless " +"the filename ends in a slash, then the whole directory is included. " "<literal>#clear</literal> is used to erase a part of the configuration tree. " -"The specified element and all its descendants are erased." +"The specified element and all its descendants are erased. (Note that these " +"lines also need to end with a semicolon.)" msgstr "" "Deux éléments spéciaux sont autorisés : <literal>#include</literal> et " "<literal>#clear</literal>. <literal>#include</literal> inclut le fichier " @@ -5691,13 +5717,31 @@ msgstr "" "ses descendants sont supprimés." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:95 +#: apt.conf.5.xml:101 +msgid "" +"The #clear command is the only way to delete a list or a complete scope. " +"Reopening a scope or the ::-style described below will <emphasis>not</" +"emphasis> override previewsly written entries. Only options can be " +"overridden by adressing a new value to it - lists and scopes can't be " +"overridden, only cleared." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:106 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name." msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "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." +"appended too by adding a trailing :: to the list name. (As you might " +"suspect: The scope syntax can't be used on the commandline.)" msgstr "" "Tous les outils d'APT possèdent une option <option>-o</option> qui permet de " "spécifier une configuration quelconque depuis la ligne de commande. La " @@ -5706,13 +5750,30 @@ msgstr "" "de l'option. On peut compléter une liste en ajoutant un « :: » au nom de la " "liste." +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:113 +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." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:102 +#: apt.conf.5.xml:125 msgid "The APT Group" msgstr "Le groupe APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:103 +#: apt.conf.5.xml:126 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -5721,12 +5782,12 @@ msgstr "" "également des options communes à tous les outils." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:107 +#: apt.conf.5.xml:130 msgid "Architecture" msgstr "Architecture" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:131 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -5737,12 +5798,12 @@ msgstr "" "valeur interne par défaut est l'architecture pour laquelle APT a été compilé." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:136 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:114 +#: apt.conf.5.xml:137 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5755,12 +5816,12 @@ msgstr "" "« 4.0 », « 5.0* ». Voir aussi &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:141 msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:119 +#: apt.conf.5.xml:142 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5770,12 +5831,12 @@ msgstr "" "décision." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:146 msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:124 +#: apt.conf.5.xml:147 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 " @@ -5789,12 +5850,12 @@ msgstr "" "les réinstaller." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:153 msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:154 msgid "" "Disable Immediate Configuration; This dangerous option disables some of " "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " @@ -5810,12 +5871,12 @@ msgstr "" "vos risques et périls." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:138 +#: apt.conf.5.xml:161 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:139 +#: apt.conf.5.xml:162 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/" @@ -5833,12 +5894,12 @@ msgstr "" "ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:170 msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:148 +#: apt.conf.5.xml:171 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -5848,24 +5909,24 @@ msgstr "" "mémoire allouée pour le chargement de ce cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:175 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:153 +#: apt.conf.5.xml:176 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:156 +#: apt.conf.5.xml:179 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:157 +#: apt.conf.5.xml:180 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5875,12 +5936,12 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:161 +#: apt.conf.5.xml:184 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:162 +#: apt.conf.5.xml:185 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -5890,12 +5951,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:189 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:167 +#: apt.conf.5.xml:190 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -5905,17 +5966,17 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:173 +#: apt.conf.5.xml:196 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:178 +#: apt.conf.5.xml:201 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:179 +#: apt.conf.5.xml:202 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -5925,12 +5986,12 @@ msgstr "" "télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:207 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:185 +#: apt.conf.5.xml:208 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -5946,12 +6007,12 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:215 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:193 +#: apt.conf.5.xml:216 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -5961,12 +6022,12 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:197 +#: apt.conf.5.xml:220 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:198 +#: apt.conf.5.xml:221 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." @@ -5976,12 +6037,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:202 sources.list.5.xml:139 +#: apt.conf.5.xml:225 sources.list.5.xml:139 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:203 +#: apt.conf.5.xml:226 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -6008,7 +6069,7 @@ msgstr "" "les options de mandataire HTTP." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:211 +#: apt.conf.5.xml:234 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 " @@ -6033,7 +6094,7 @@ msgstr "" "en compte aucune de ces options." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:221 apt.conf.5.xml:273 +#: apt.conf.5.xml:244 apt.conf.5.xml:301 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6043,7 +6104,7 @@ msgstr "" "(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:224 +#: apt.conf.5.xml:247 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) " @@ -6062,13 +6123,23 @@ msgstr "" "sinon des données seront corrompues. Les machines qui ont besoin de cette " "option ne respectent pas la RFC 2068." +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:255 +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 " +"which deactivates the limit and tries uses as much as possible of the " +"bandwith (Note that this option implicit deactivates the download from " +"multiple servers at the same time.)" +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:261 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:262 msgid "" "HTTPS URIs. Cache-control and proxy options are the same as for " "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " @@ -6079,7 +6150,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> n'est pas encore supportée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:266 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6111,12 +6182,12 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:256 sources.list.5.xml:150 +#: apt.conf.5.xml:284 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:285 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@ -6164,7 +6235,7 @@ msgstr "" "respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:276 +#: apt.conf.5.xml:304 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 " @@ -6181,7 +6252,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:283 +#: apt.conf.5.xml:311 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 " @@ -6196,7 +6267,7 @@ msgstr "" "de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:288 +#: apt.conf.5.xml:316 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6212,18 +6283,18 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:295 sources.list.5.xml:132 +#: apt.conf.5.xml:323 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:301 +#: apt.conf.5.xml:329 #, no-wrap msgid "\"/cdrom/\"::Mount \"foo\";" msgstr "\"/cdrom/\"::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:296 +#: apt.conf.5.xml:324 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 " @@ -6245,12 +6316,12 @@ msgstr "" "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:306 +#: apt.conf.5.xml:334 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:307 +#: apt.conf.5.xml:335 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6261,18 +6332,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:340 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:318 +#: apt.conf.5.xml:346 #, 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:313 +#: apt.conf.5.xml:341 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6284,19 +6355,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:323 +#: apt.conf.5.xml:351 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:354 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:347 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 " @@ -6313,13 +6384,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:358 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:356 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6334,7 +6405,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:335 +#: apt.conf.5.xml:363 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6344,7 +6415,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:174 +#: apt.conf.5.xml:197 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6354,12 +6425,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:372 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:374 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6379,7 +6450,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:353 +#: apt.conf.5.xml:381 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6402,7 +6473,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:390 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6417,7 +6488,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:396 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 " @@ -6428,7 +6499,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:372 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@ -6453,7 +6524,7 @@ msgstr "" "l'emplacement des programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:408 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6475,12 +6546,12 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:393 +#: apt.conf.5.xml:421 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:423 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6491,12 +6562,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:399 +#: apt.conf.5.xml:427 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:400 +#: apt.conf.5.xml:428 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 " @@ -6514,7 +6585,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:409 +#: apt.conf.5.xml:437 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6523,12 +6594,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:413 +#: apt.conf.5.xml:441 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:414 +#: apt.conf.5.xml:442 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6537,12 +6608,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:418 +#: apt.conf.5.xml:446 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:419 +#: apt.conf.5.xml:447 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6552,12 +6623,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:425 +#: apt.conf.5.xml:453 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:454 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6566,7 +6637,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:431 +#: apt.conf.5.xml:459 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 " @@ -6577,17 +6648,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:464 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:464 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:465 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 " @@ -6600,12 +6671,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:443 +#: apt.conf.5.xml:471 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:444 +#: apt.conf.5.xml:472 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 " @@ -6621,7 +6692,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:478 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6637,12 +6708,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:458 +#: apt.conf.5.xml:486 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6651,12 +6722,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:463 +#: apt.conf.5.xml:491 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6666,12 +6737,12 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:468 +#: apt.conf.5.xml:496 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:497 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -6686,7 +6757,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6696,7 +6767,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:506 msgid "" "Note that it is not garanteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6710,12 +6781,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:518 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6727,14 +6798,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:527 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6750,12 +6821,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:537 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6766,12 +6837,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6781,12 +6852,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:550 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:551 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-" @@ -6798,12 +6869,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:558 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6815,7 +6886,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:559 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 " @@ -6829,12 +6900,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:579 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:580 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6846,12 +6917,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:588 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:590 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6869,7 +6940,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:601 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6880,7 +6951,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:609 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6892,7 +6963,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:618 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6904,7 +6975,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:598 +#: apt.conf.5.xml:626 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -6913,17 +6984,17 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 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:613 +#: apt.conf.5.xml:641 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:617 +#: apt.conf.5.xml:645 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -6931,44 +7002,44 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:624 +#: apt.conf.5.xml:652 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:628 +#: apt.conf.5.xml:656 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:635 +#: apt.conf.5.xml:663 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:639 +#: apt.conf.5.xml:667 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:646 +#: apt.conf.5.xml:674 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:650 +#: apt.conf.5.xml:678 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:657 +#: apt.conf.5.xml:685 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:661 +#: apt.conf.5.xml:689 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -6977,12 +7048,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:696 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -6991,24 +7062,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:679 +#: apt.conf.5.xml:707 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:710 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:689 +#: apt.conf.5.xml:717 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:720 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7017,12 +7088,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:699 +#: apt.conf.5.xml:727 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:730 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 " @@ -7033,12 +7104,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:738 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:713 +#: apt.conf.5.xml:741 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." @@ -7048,24 +7119,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:721 +#: apt.conf.5.xml:749 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:753 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:732 +#: apt.conf.5.xml:760 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:735 +#: apt.conf.5.xml:763 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7075,12 +7146,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:742 +#: apt.conf.5.xml:770 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:745 +#: apt.conf.5.xml:773 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7090,12 +7161,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:781 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:757 +#: apt.conf.5.xml:785 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7105,12 +7176,12 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:764 +#: apt.conf.5.xml:792 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:768 +#: apt.conf.5.xml:796 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7118,12 +7189,12 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:775 +#: apt.conf.5.xml:803 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:779 +#: apt.conf.5.xml:807 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7132,12 +7203,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:786 +#: apt.conf.5.xml:814 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:789 +#: apt.conf.5.xml:817 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7152,12 +7223,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:828 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:803 +#: apt.conf.5.xml:831 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7192,24 +7263,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:850 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:853 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:832 +#: apt.conf.5.xml:860 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:835 +#: apt.conf.5.xml:863 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7218,12 +7289,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:843 +#: apt.conf.5.xml:871 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:874 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7233,12 +7304,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:853 +#: apt.conf.5.xml:881 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:857 +#: apt.conf.5.xml:885 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7247,33 +7318,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:865 +#: apt.conf.5.xml:893 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:897 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:876 +#: apt.conf.5.xml:904 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 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:886 +#: apt.conf.5.xml:914 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:918 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7282,12 +7353,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:898 +#: apt.conf.5.xml:926 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:901 +#: apt.conf.5.xml:929 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 " @@ -7298,12 +7369,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:937 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7312,7 +7383,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:935 +#: apt.conf.5.xml:963 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7321,7 +7392,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:970 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7329,7 +7400,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:975 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." diff --git a/doc/po/ja.po b/doc/po/ja.po index e7d67ddaa..fc1fec09e 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-09-18 17:09+0300\n" +"POT-Creation-Date: 2009-09-24 15:02+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1557,8 +1557,15 @@ 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:229 +#, fuzzy +#| msgid "" +#| "This command prints the name of each package in the system. The optional " +#| "argument is a prefix match to filter the name list. The output is " +#| "suitable for use in a shell tab complete function and the output is " +#| "generated extremely quickly. This command is best used with the <option>--" +#| "generate</option> option." msgid "" -"This command prints the name of each package in the system. The optional " +"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 " "extremely quickly. This command is best used with the <option>--generate</" @@ -1569,15 +1576,23 @@ msgstr "" "タブによる補完機能に使いやすく、また非常に速く生成されます。このコマンドは " "<option>--generate</option> オプションと共に使用すると非常に便利です。" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:234 +msgid "" +"Note that a package which APT knows of is not nessasarily available to " +"download, installable or installed, e.g. virtual packages are also listed in " +"the generated list." +msgstr "" + # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:236 +#: apt-cache.8.xml:239 msgid "dotty <replaceable>pkg(s)</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:237 +#: apt-cache.8.xml:240 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." @@ -1597,7 +1612,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:246 +#: apt-cache.8.xml:249 msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " @@ -1611,18 +1626,18 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:251 +#: apt-cache.8.xml:254 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:254 +#: apt-cache.8.xml:257 msgid "xvcg <replaceable>pkg(s)</replaceable>" msgstr "xvcg <replaceable>pkg(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-cache.8.xml:255 +#: apt-cache.8.xml:258 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>." @@ -1632,13 +1647,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:259 +#: apt-cache.8.xml:262 msgid "policy <replaceable>[ pkg(s) ]</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:260 +#: apt-cache.8.xml:263 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 " @@ -1651,13 +1666,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:266 +#: apt-cache.8.xml:269 msgid "madison <replaceable>/[ pkg(s) ]</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:267 +#: apt-cache.8.xml:270 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 " @@ -1676,25 +1691,25 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:278 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:408 apt.conf.5.xml:430 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 msgid "options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:282 +#: apt-cache.8.xml:285 msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:282 +#: apt-cache.8.xml:285 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:283 +#: apt-cache.8.xml:286 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::" @@ -1705,19 +1720,19 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:288 +#: apt-cache.8.xml:291 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:289 +#: apt-cache.8.xml:292 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 " @@ -1732,18 +1747,18 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 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:297 +#: apt-cache.8.xml:300 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 " @@ -1756,18 +1771,18 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:306 msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:303 +#: apt-cache.8.xml:306 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:304 +#: apt-cache.8.xml:307 msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " @@ -1778,18 +1793,18 @@ msgstr "" "Cache::Important</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333 +#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:309 +#: apt-cache.8.xml:312 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:310 +#: apt-cache.8.xml:313 msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." @@ -1798,18 +1813,18 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:314 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:314 +#: apt-cache.8.xml:317 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:315 +#: apt-cache.8.xml:318 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-" @@ -1825,18 +1840,18 @@ msgstr "" "用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:326 msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:323 +#: apt-cache.8.xml:326 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:324 +#: apt-cache.8.xml:327 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</" @@ -1848,18 +1863,18 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:329 +#: apt-cache.8.xml:332 msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:329 apt-cdrom.8.xml:139 +#: apt-cache.8.xml:332 apt-cdrom.8.xml:139 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:330 +#: apt-cache.8.xml:333 msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1868,13 +1883,13 @@ msgstr "" "Cache::NamesOnly</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:334 +#: apt-cache.8.xml:337 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:335 +#: apt-cache.8.xml:338 msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" @@ -1884,13 +1899,13 @@ msgstr "" "表示します。設定項目 - <literal>APT::Cache::AllNames</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:340 +#: apt-cache.8.xml:343 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:341 +#: apt-cache.8.xml:344 msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " @@ -1901,13 +1916,13 @@ msgstr "" "RecurseDepends</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:346 +#: apt-cache.8.xml:349 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:348 +#: apt-cache.8.xml:351 msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " @@ -1919,7 +1934,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 #: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" @@ -1927,35 +1942,35 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:940 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 +#: apt.conf.5.xml:968 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:360 +#: apt-cache.8.xml:363 msgid "&file-sourceslist; &file-statelists;" msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:366 +#: apt-cache.8.xml:369 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:370 apt-cdrom.8.xml:160 apt-config.8.xml:108 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 #: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" @@ -1963,7 +1978,7 @@ msgstr "診断メッセージ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-cache.8.xml:371 +#: apt-cache.8.xml:374 msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." @@ -3630,7 +3645,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -5849,9 +5864,19 @@ msgstr "" "設定項目の名前は、文字の大小を区別しません。そのため、前述の例を " "<literal>dpkg::pre-install-pkgs</literal> とできます。" -# type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:89 +msgid "" +"Names for the configuration items are optional if a list is defined as it " +"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " +"If you don't specify a name a new entry will simply add a new option to the " +"list. If you specify a name you can override the option as every other " +"option by reassigning a new value to the option." +msgstr "" + +# type: Content of: <refentry><refsect1><para> +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 #, fuzzy #| msgid "" #| "Two specials are allowed, <literal>#include</literal> and " @@ -5862,10 +5887,11 @@ msgstr "" #| "erased." msgid "" "Two specials are allowed, <literal>#include</literal> and <literal>#clear</" -"literal> <literal>#include</literal> will include the given file, unless the " -"filename ends in a slash, then the whole directory is included. " +"literal>: <literal>#include</literal> will include the given file, unless " +"the filename ends in a slash, then the whole directory is included. " "<literal>#clear</literal> is used to erase a part of the configuration tree. " -"The specified element and all its descendants are erased." +"The specified element and all its descendants are erased. (Note that these " +"lines also need to end with a semicolon.)" msgstr "" "<literal>#include</literal> と <literal>#clear</literal> の 2 つの特別な記法" "があります。<literal>#include</literal> は指定したファイルを取り込みます。" @@ -5873,30 +5899,65 @@ msgstr "" "す。<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。" "指定した要素と、それ以下の要素を削除します。" +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:101 +msgid "" +"The #clear command is the only way to delete a list or a complete scope. " +"Reopening a scope or the ::-style described below will <emphasis>not</" +"emphasis> override previewsly written entries. Only options can be " +"overridden by adressing a new value to it - lists and scopes can't be " +"overridden, only cleared." +msgstr "" + # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:95 +#: apt.conf.5.xml:106 +#, fuzzy +#| msgid "" +#| "All of the APT tools take a -o option which allows an arbitrary " +#| "configuration directive to be specified on the command line. The syntax " +#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for " +#| "instance) followed by an equals sign then the new value of the option. " +#| "Lists can be appended too by adding a trailing :: to the list name." msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " "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." +"appended too by adding a trailing :: to the list name. (As you might " +"suspect: The scope syntax can't be used on the commandline.)" msgstr "" "すべての APT ツールで、コマンドラインで任意の設定を行う -o オプションが使用で" "きます。文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</" "literal>)、等号、続いてオプションの新しい値となります。リスト名に続き::を加え" "ることで、リストを追加することができます。" +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:113 +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." +msgstr "" + # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:102 +#: apt.conf.5.xml:125 msgid "The APT Group" msgstr "APT グループ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:103 +#: apt.conf.5.xml:126 msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." @@ -5906,13 +5967,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:107 +#: apt.conf.5.xml:130 msgid "Architecture" msgstr "Architecture" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:108 +#: apt.conf.5.xml:131 msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " @@ -5924,12 +5985,12 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:113 +#: apt.conf.5.xml:136 msgid "Default-Release" msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:114 +#: apt.conf.5.xml:137 msgid "" "Default release to install packages from if more than one version available. " "Contains release name, codename or release version. Examples: 'stable', " @@ -5942,13 +6003,13 @@ msgstr "" "す。 &apt-preferences; も参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:118 +#: apt.conf.5.xml:141 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:119 +#: apt.conf.5.xml:142 msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." @@ -5958,13 +6019,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:123 +#: apt.conf.5.xml:146 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:124 +#: apt.conf.5.xml:147 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 " @@ -5979,13 +6040,13 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:130 +#: apt.conf.5.xml:153 msgid "Immediate-Configure" msgstr "Immediate-Configure" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:131 +#: apt.conf.5.xml:154 msgid "" "Disable Immediate Configuration; This dangerous option disables some of " "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " @@ -6000,13 +6061,13 @@ msgstr "" "ください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:138 +#: apt.conf.5.xml:161 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:139 +#: apt.conf.5.xml:162 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/" @@ -6024,13 +6085,13 @@ msgstr "" "不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:147 +#: apt.conf.5.xml:170 msgid "Cache-Limit" msgstr "Cache-Limit" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:148 +#: apt.conf.5.xml:171 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6039,24 +6100,24 @@ msgstr "" "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:152 +#: apt.conf.5.xml:175 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:153 +#: apt.conf.5.xml:176 msgid "Defines which package(s) are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:156 +#: apt.conf.5.xml:179 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:157 +#: apt.conf.5.xml:180 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6065,13 +6126,13 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:161 +#: apt.conf.5.xml:184 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:162 +#: apt.conf.5.xml:185 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6080,13 +6141,13 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:166 +#: apt.conf.5.xml:189 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:167 +#: apt.conf.5.xml:190 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6096,17 +6157,17 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:173 +#: apt.conf.5.xml:196 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:178 +#: apt.conf.5.xml:201 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:179 +#: apt.conf.5.xml:202 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6116,13 +6177,13 @@ msgstr "" "ルトでは True です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:207 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:185 +#: apt.conf.5.xml:208 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6137,13 +6198,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:192 +#: apt.conf.5.xml:215 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:193 +#: apt.conf.5.xml:216 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6152,13 +6213,13 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:197 +#: apt.conf.5.xml:220 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:198 +#: apt.conf.5.xml:221 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." @@ -6169,13 +6230,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:202 sources.list.5.xml:139 +#: apt.conf.5.xml:225 sources.list.5.xml:139 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:203 +#: apt.conf.5.xml:226 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -6201,7 +6262,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:211 +#: apt.conf.5.xml:234 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 " @@ -6226,7 +6287,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:221 apt.conf.5.xml:273 +#: apt.conf.5.xml:244 apt.conf.5.xml:301 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6238,7 +6299,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:224 +#: apt.conf.5.xml:247 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) " @@ -6256,14 +6317,24 @@ msgstr "" "ければデータが破損してしまいます。これが必要なホストは RFC 2068 に違反してい" "ます。" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:255 +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 " +"which deactivates the limit and tries uses as much as possible of the " +"bandwith (Note that this option implicit deactivates the download from " +"multiple servers at the same time.)" +msgstr "" + # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:233 +#: apt.conf.5.xml:261 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:262 msgid "" "HTTPS URIs. Cache-control and proxy options are the same as for " "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " @@ -6274,7 +6345,7 @@ msgstr "" "していません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:238 +#: apt.conf.5.xml:266 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6296,13 +6367,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:256 sources.list.5.xml:150 +#: apt.conf.5.xml:284 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:257 +#: apt.conf.5.xml:285 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@ -6345,7 +6416,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:276 +#: apt.conf.5.xml:304 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 " @@ -6361,7 +6432,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:283 +#: apt.conf.5.xml:311 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 " @@ -6375,7 +6446,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:288 +#: apt.conf.5.xml:316 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6392,19 +6463,19 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:295 sources.list.5.xml:132 +#: apt.conf.5.xml:323 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:301 +#: apt.conf.5.xml:329 #, 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:296 +#: apt.conf.5.xml:324 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 " @@ -6425,13 +6496,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:306 +#: apt.conf.5.xml:334 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:307 +#: apt.conf.5.xml:335 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6442,18 +6513,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:312 +#: apt.conf.5.xml:340 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:318 +#: apt.conf.5.xml:346 #, 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:313 +#: apt.conf.5.xml:341 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6465,19 +6536,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:323 +#: apt.conf.5.xml:351 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:326 +#: apt.conf.5.xml:354 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:319 +#: apt.conf.5.xml:347 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 " @@ -6494,13 +6565,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:330 +#: apt.conf.5.xml:358 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:328 +#: apt.conf.5.xml:356 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6515,7 +6586,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:335 +#: apt.conf.5.xml:363 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6526,7 +6597,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:174 +#: apt.conf.5.xml:197 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6537,13 +6608,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:372 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:374 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6563,7 +6634,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:353 +#: apt.conf.5.xml:381 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6585,7 +6656,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:362 +#: apt.conf.5.xml:390 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6600,7 +6671,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:368 +#: apt.conf.5.xml:396 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 " @@ -6612,7 +6683,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:372 +#: apt.conf.5.xml:400 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@ -6637,7 +6708,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:380 +#: apt.conf.5.xml:408 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6658,13 +6729,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:393 +#: apt.conf.5.xml:421 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:395 +#: apt.conf.5.xml:423 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6674,13 +6745,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:399 +#: apt.conf.5.xml:427 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:400 +#: apt.conf.5.xml:428 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 " @@ -6697,7 +6768,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:409 +#: apt.conf.5.xml:437 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6707,13 +6778,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:413 +#: apt.conf.5.xml:441 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:414 +#: apt.conf.5.xml:442 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6722,13 +6793,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:418 +#: apt.conf.5.xml:446 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:419 +#: apt.conf.5.xml:447 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6738,13 +6809,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:425 +#: apt.conf.5.xml:453 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:426 +#: apt.conf.5.xml:454 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6754,7 +6825,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:431 +#: apt.conf.5.xml:459 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 " @@ -6764,18 +6835,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:464 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:436 +#: apt.conf.5.xml:464 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:437 +#: apt.conf.5.xml:465 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 " @@ -6789,13 +6860,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 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:444 +#: apt.conf.5.xml:472 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 " @@ -6811,7 +6882,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:450 +#: apt.conf.5.xml:478 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6827,13 +6898,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 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:458 +#: apt.conf.5.xml:486 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6843,13 +6914,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 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:463 +#: apt.conf.5.xml:491 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6858,12 +6929,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:468 +#: apt.conf.5.xml:496 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:469 +#: apt.conf.5.xml:497 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -6878,7 +6949,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6888,7 +6959,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:506 msgid "" "Note that it is not garanteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6902,12 +6973,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:518 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6920,14 +6991,14 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:499 +#: apt.conf.5.xml:527 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6944,13 +7015,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:509 +#: apt.conf.5.xml:537 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6961,12 +7032,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6976,12 +7047,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:522 +#: apt.conf.5.xml:550 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:523 +#: apt.conf.5.xml:551 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-" @@ -6993,12 +7064,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:530 +#: apt.conf.5.xml:558 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7010,7 +7081,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:531 +#: apt.conf.5.xml:559 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 " @@ -7024,12 +7095,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:579 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:552 +#: apt.conf.5.xml:580 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7043,12 +7114,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:560 +#: apt.conf.5.xml:588 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:562 +#: apt.conf.5.xml:590 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7059,7 +7130,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:573 +#: apt.conf.5.xml:601 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7070,7 +7141,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:581 +#: apt.conf.5.xml:609 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7081,7 +7152,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:618 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7091,66 +7162,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:598 +#: apt.conf.5.xml:626 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:608 +#: apt.conf.5.xml:636 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:613 +#: apt.conf.5.xml:641 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:617 +#: apt.conf.5.xml:645 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:624 +#: apt.conf.5.xml:652 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:628 +#: apt.conf.5.xml:656 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:635 +#: apt.conf.5.xml:663 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:639 +#: apt.conf.5.xml:667 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:646 +#: apt.conf.5.xml:674 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:650 +#: apt.conf.5.xml:678 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:657 +#: apt.conf.5.xml:685 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:661 +#: apt.conf.5.xml:689 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7158,46 +7229,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:668 +#: apt.conf.5.xml:696 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 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:679 +#: apt.conf.5.xml:707 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:682 +#: apt.conf.5.xml:710 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:689 +#: apt.conf.5.xml:717 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:692 +#: apt.conf.5.xml:720 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:699 +#: apt.conf.5.xml:727 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:702 +#: apt.conf.5.xml:730 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 " @@ -7205,93 +7276,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:738 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:713 +#: apt.conf.5.xml:741 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:721 +#: apt.conf.5.xml:749 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:725 +#: apt.conf.5.xml:753 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:732 +#: apt.conf.5.xml:760 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:735 +#: apt.conf.5.xml:763 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:742 +#: apt.conf.5.xml:770 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:745 +#: apt.conf.5.xml:773 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:753 +#: apt.conf.5.xml:781 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:757 +#: apt.conf.5.xml:785 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:764 +#: apt.conf.5.xml:792 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:768 +#: apt.conf.5.xml:796 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:775 +#: apt.conf.5.xml:803 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:779 +#: apt.conf.5.xml:807 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:786 +#: apt.conf.5.xml:814 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:789 +#: apt.conf.5.xml:817 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7301,12 +7372,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:800 +#: apt.conf.5.xml:828 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:803 +#: apt.conf.5.xml:831 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7323,91 +7394,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:822 +#: apt.conf.5.xml:850 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:825 +#: apt.conf.5.xml:853 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:832 +#: apt.conf.5.xml:860 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:835 +#: apt.conf.5.xml:863 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:843 +#: apt.conf.5.xml:871 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:846 +#: apt.conf.5.xml:874 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:853 +#: apt.conf.5.xml:881 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:857 +#: apt.conf.5.xml:885 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:865 +#: apt.conf.5.xml:893 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:869 +#: apt.conf.5.xml:897 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:876 +#: apt.conf.5.xml:904 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:886 +#: apt.conf.5.xml:914 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:890 +#: apt.conf.5.xml:918 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:898 +#: apt.conf.5.xml:926 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:901 +#: apt.conf.5.xml:929 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 " @@ -7415,12 +7486,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:909 +#: apt.conf.5.xml:937 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7428,7 +7499,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:935 +#: apt.conf.5.xml:963 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7438,7 +7509,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:942 +#: apt.conf.5.xml:970 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7447,7 +7518,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:947 +#: apt.conf.5.xml:975 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -- cgit v1.2.3-70-g09d2 From b3895e8685e40f1cac01e735ae42bdb8dab684a3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 24 Sep 2009 15:09:05 +0200 Subject: readd the pl-translation for the offline apt documentation for now as long as these files are not included in the po4a-powered translation work --- debian/changelog | 5 +- doc/pl/makefile | 11 +++ doc/pl/offline.pl.sgml | 252 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 3 deletions(-) create mode 100644 doc/pl/makefile create mode 100644 doc/pl/offline.pl.sgml (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 22f83a4dc..35a396537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,9 +55,8 @@ apt (0.7.24) UNRELEASED; urgency=low * doc/fr/*, doc/po/fr.po: - remove the old fr man page translation and replace it with the new po4a-powered translation - * doc/pl, doc/de: dropped (pl translation is useless as the translated - document is not provideed anymore and the de translation is too - incomplete to be used) + * doc/de: dropped (translation is too incomplete to be useful in + the transition to the po4a-powered translations) -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200 diff --git a/doc/pl/makefile b/doc/pl/makefile new file mode 100644 index 000000000..94939e156 --- /dev/null +++ b/doc/pl/makefile @@ -0,0 +1,11 @@ +# -*- make -*- +BASE=../.. +SUBDIR=doc/pl + +# Bring in the default rules +include ../../buildlib/defaults.mak + +# Debian Doc SGML Documents +SOURCE = offline.pl.sgml +DEBIANDOC_HTML_OPTIONS=-l pl +include $(DEBIANDOC_H) diff --git a/doc/pl/offline.pl.sgml b/doc/pl/offline.pl.sgml new file mode 100644 index 000000000..0d301d4fb --- /dev/null +++ b/doc/pl/offline.pl.sgml @@ -0,0 +1,252 @@ +<!doctype debiandoc PUBLIC "-//DebianDoc//DTD DebianDoc//EN"> +<!-- -*- mode: sgml; mode: fold -*- --> +<book> +<title>Uywanie APT w trybie offline + +Jason Gunthorpe jgg@debian.org +Polskie tumaczenie Krzysztof Fiertek akfedux@megapolis.pl +$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $ + + +Dokument ten opisuje uywanie programu APT w rodowiskach pozbawionych dostpu, +do sieci, a w szczeglnoci metod pozwalajc na robienie aktualizacji systemu. + + + +Copyright © Jason Gunthorpe, 1999. +

+Copyright © polskiego tumaczenia Krzysztof Fiertek, 2004. +

+"APT" i ten dokument s oprogramowaniem wolnodostpnym; moesz +rozpowszechnia je i/lub zmienia w zgodzie z postanowieniami +"Oglnej Licencji Publicznej GNU" (GNU General Public License) +takiej, jak zostaa opublikowana przez "Fundacje Wolnego +Oprogramowania (Free Software Foundation); albo w wersji 2 teje +licencji, albo (twj wybr) w dowolnej pniejszej. + +

+Wicej szczegw mona uzyska, przegldajc plik zawierajcy peny tekst +licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL). + + + + +Wstp + + +Wprowadzenie + +

+Normalnie APT wymaga bezporedniego dostpu do archiww Debiana przez +sie lokaln albo przez sie internetow. Kolejn niedogodnoci moe by +fakt, e nasz komputer, ktry pracuje na powolnym czu takim jak modem, +jest znacznie oddalony od innego komputera z szybkim czem. + +

+Rozwizaniem tego problemu jest uycie pojemnych przenonych nonikw +takich jak dyskietka Zip lub dysk SuperDisk. Noniki te nie s +wystarczajco pojemne, by zgromadzi kompletne archiwum Debiana, ale mona +miao dopasowa podzbir duego archiwum wystarczajcy dla wikszoci +uytkownikw. Pomys polega na tym, by uy programu APT do wygenerowania +listy pakietw, ktre s wymagane, a nastpnie pobraniu ich na dysk, uywajc +innego komputera z waciw zwartoci. Jest nawet moliwe, by uy innego +komputera z Debianem z zainstalowanym programem APT lub zupenie innym +systemem operacyjnym i programem narzdziowym do pobierania plikw takim +jak wget. + +

+Osigane jest to przez twrcze manipulowanie plikiem konfiguracyjnym +programu APT. Rzecz niezbdn jest poinformowanie programu APT, aby wskazywa +na dysk z plikami archiwum. Naley zauway, e dysk powinien by +sformatowany do obsugi systemu plikw pozwalajcego posugiwa si dugimi +nazwami plikw (np. ext2, fat32 albo vfat). + + + + + +Uywanie programu APT na obu komputerach + + +Wprowadzenie + +

+APT bdcy do dyspozycji na obu komputerach daje najprostsz kombinacj. +Zasadniczym pomysem tej metody jest umieszczenie kopii pliku status na dysku +i uycie odlegego komputera, aby uzyska najnowsze pliki pakietw +i zdecydowa, ktre pakiety trzeba pobra. Struktura katalogw na dysku +powinna wyglda nastpujco: + + + /disc/ + archives/ + partial/ + lists/ + partial/ + status + sources.list + apt.conf + + + + + + +Plik konfiguracyjny + +

+Plik konfiguracyjny powinien informowa program APT, aby przechowywa swoje +pliki na dysku, a take uywa plikw konfiguracyjnych z dysku. Plik +sources.list powinien zawiera prawidowe odnoniki, ktrych naley +uy na zdalnym komputerze, a plik status powinien by kopi +/var/lib/dpkg/status. Zauwa, e jeli uywasz lokalnego archiwum +musisz uy tych samych odnonikw o identycznej skadni. + +

+apt.conf musi zawiera niezbdne wpisy, by APT korzysta z dysku: + + + APT + { + /* Ten wpis nie jest wymagany, jeli oba komputery maj t sam + architektur; mwi on programowi APT na komputerze pobierajcym + pakiety, jaka jest architektura naszego komputera */ + Architecture "i386"; + + Get::Download-Only "true"; + }; + + Dir + { + /* Uyj katalogu disc na informacje stanu i przekieruj plik status + z domylnego /var/lib/dpkg */ + State "/disc/"; + State::status "status"; + + // Katalog lokalnie przechowywanych pakietw binarnych + Cache::archives "/disc/archives/"; + + Cache "/tmp/"; + + // Lokalizacja pliku sources.list. + Etc "/disc"; + }; + + +Wicej szczegw mona zobaczy w stronie podrcznika apt.conf i w przykadowym +pliku konfiguracyjnym /usr/share/doc/apt/examples/apt.conf. + +

+Pierwsz rzecz, jak naley zrobi na oddalonym komputerze z Debianem to +zamontowa dysk i przekopiowa na niego plik /var/lib/dpkg/status. +Trzeba take utworzy stuktur katalogw przedstawion we "Wprowadzeniu": +archives/partial/ i lists/partial/. Nastpnie niesiemy +dysk do oddalonego komputera z szybkim czem i konfigurujemy plik +sources.list. Na oddalonym komputerze wykonujemy kolejno: + + + # export APT_CONFIG="/disc/apt.conf" + # apt-get update + [ APT aktualizuje ustawienia ] + # apt-get dist-upgrade + [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ] + + + +Polecenie dist-upgrade mona zastpi kadym innym podstawowym poleceniem +APT, w szczeglnoci dselect-upgrade. Mona nawet uy APT jako metody +dostpu dla dselect. Jednak stworzy to problem w przeniesieniu +Twoich operacji wyborw z powrotem na lokalny komputer. + +

+W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa +niezbdne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do +siebie i wpisujemy: + + + # export APT_CONFIG="/disc/apt.conf" + # apt-get check + [ APT tworzy lokaln kopi plikw cache ] + # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade + [ Moe te by inne polecenie programu APT ] + + +

+Do prawidowego dziaania koniecznie naley poda plik status z lokalnej +maszyny. To jest bardzo wane! + +

+Jeli uywasz dselect, moesz wykona bardzo ryzykown operacj skopiowania +disc/status do /var/lib/dpkg/status, tak e wszystkie zmiany, ktrych +dokonae na odlegym komputerze, bd przeniesione. Mocno zalecam, aby +dokonywa doboru pakietw tylko na lokalnym komputerze, ale nie zawsze +jest to moliwe. NIE podmieniaj pliku status, jeli dpkg lub APT byy +uruchamiane w midzyczasie!! + + + + +Uywanie programw APT i wget + + +Wprowadzenie + +

+wget jest popularnym i przenonym programem narzdziowym +pobierania plikw, ktry dziaa prawie na kadym komputerze. +W przeciwiestwie do metody opisanej powyej ta wymaga, aby na lokalnym komputerze +bya aktualna lista dostpnych pakietw. + +

+Naley stworzy katalog disc tylko na pakiety do pobrania z innego +komputera. Uyta zostanie do tego opcja --print-uris programu apt-get, +a nastpnie przygotujemy skrypt dla programu wget, ktry pobierze waciwe +pakiety. + + + + + +Kolejne kroki + +

+W odrnieniu od poprzedniej metody dziaania ta nie wymaga specjalnych +plikw konfiguracyjnych. Uywamy jedynie podstawowych polece APT, by +wygenerowa list plikw. + + + # apt-get dist-upgrade + [ Wybierz "no" po znaku zachty, upewnij si, czy to waciwy wybr ] + # apt-get -qq --print-uris dist-upgrade > uris + # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script + + +Take inne opcje ni dist-upgrade mog tu by uyte, wczajc +dselect-upgrade. + +

+Plik skryptu /disc/wget-script bdzie teraz zawiera list wywoa programu +wget, niezbdnych do pobrania potrzebnych archiww. +Skrypt ten naley uruchomi w biecym katalogu o punkcie montowania disc, +tak aby tu zapisywa dane na dysku. + +

+Na oddalonym komputerze naley wykona co takiego + + + # cd /disc + # sh -x ./wget-script + [ czekaj.. ] + + +Gdy archiwa zostan pobrane i dysk wrci do komputera z Debianem, +instalowanie mona prowadzi dalej poleceniem: + + + # apt-get -o dir::cache::archives="/disc/" dist-upgrade + + +ktre uyje pobranych uprzednio archiww z dysku. + + + -- cgit v1.2.3-70-g09d2 From b98f40fadef0ee5419e2315d82110869135e410f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 24 Sep 2009 18:11:10 +0200 Subject: add a NEWS entry for the upcoming upload summarizing the bigger and/or user-visible changes. --- debian/NEWS | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 88f2c564e..1df94144d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,19 @@ +apt (0.7.24) unstable; urgency=low + + * Allready included in the last version but now with better documentation + is the possibility to add/prefer different compression types while + downloading archive informations, which can decrease the time needed for + update on slow machines. See apt.conf (5) manpage for details. + * APT manages his manpage translations now with po4a, thanks to Nicolas + François and Kurasawa Nozomu, who also provide the ja translation. + Thanks to Christian Perrier we have already a fr translation and + a few more are hopefully added in the near future. + * This version also introduces some _experimental_ configuration options + to make more aggressive use of dpkg's triggers. If you want to help + testing these _experimental_ options see apt.conf (5) manpage. + + -- David Kalnischkies Thu, 24 Sep 2009 15:13:16 +0200 + apt (0.7.23) unstable; urgency=low * Code that determines which proxy to use was changed. Now -- cgit v1.2.3-70-g09d2 From a956474121b3d3b7ffac821a330f9fe7737ac91b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 25 Sep 2009 09:49:45 +0200 Subject: fix same typos in debian/changelog and doc/apt.conf.5.xml --- debian/changelog | 2 +- doc/apt.conf.5.xml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 35a396537..c9c0d49e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,7 +29,7 @@ apt (0.7.24) UNRELEASED; urgency=low a bit and improve the documentation for this option group. * doc/apt.conf.5.xml: - document the Acquire::http::Dl-Limit option - - try to be cristal clear about the usage of :: and {} (Closes: #503481) + - try to be crystal clear about the usage of :: and {} (Closes: #503481) * doc/apt-cache.8.xml: - clarify the note for the pkgnames command (Closes: #547599) * doc/apt.ent, all man pages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index cfc09ec1f..e752f9d27 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -100,7 +100,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The #clear command is the only way to delete a list or a complete scope. Reopening a scope or the ::-style described below will not - override previewsly written entries. Only options can be overridden by adressing a new + override previously written entries. Only options can be overridden by addressing a new value to it - lists and scopes can't be overridden, only cleared. All of the APT tools take a -o option which allows an arbitrary configuration @@ -108,7 +108,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; name (APT::Get::Assume-Yes 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 commandline.) + on the command line.) 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. @@ -254,7 +254,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The used bandwidth can be limited with Acquire::http::Dl-Limit which accepts integer values in kilobyte. The default value is 0 which deactivates - the limit and tries uses as much as possible of the bandwith (Note that this option implicit + the limit and tries uses as much as possible of the bandwidth (Note that this option implicit deactivates the download from multiple servers at the same time.) @@ -356,7 +356,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Note that at run time the Dir::Bin::Methodname 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 Dir::Bin::bzip2 "/bin/bzip2"; - Note also that list entries specified on the commandline will be added at the end of the list + 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 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. @@ -498,12 +498,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; multiply calls of dpkg. Without further options dpkg will use triggers only in between his own run. Activating these options can therefore decrease the time needed to perform the install / upgrade. Note that it is intended to activate these options per default in the - future, but as it changes the way APT calling dpkg drastical it needs a lot more testing. + future, but as it changes the way APT calling dpkg drastically it needs a lot more testing. These options are therefore currently experimental and should not be used in productive environments. Also it breaks the progress reporting so all frontends will currently stay around half (or more) of the time in the 100% state while it actually configures all packages. - Note that it is not garanteed that APT will support these options or that these options will + 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 understand the current risks and problems with these options, but are brave enough to help testing them create a new configuration file and test a combination of options. Please report any bugs, problems and improvements you encounter and make sure @@ -550,7 +550,7 @@ DPkg::TriggersPending "true"; 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 verious steps by everything. While both method + and therefore the "old" method of ordering in various steps by everything. While both method were present in earlier APT versions the OrderCritical method was unused, so this method is very experimental and needs further improvements before becoming really useful. @@ -560,7 +560,7 @@ DPkg::TriggersPending "true"; 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 will run quite a few triggers (which maybe not needed). Essentials get per default a high score - but the immediate flag is relativly low (a package which has a Pre-Depends is higher rated). + but the immediate flag is relatively low (a package which has a Pre-Depends is higher rated). These option and the others in the same group can be used to change the scoring. The following example shows the settings with there default values. OrderList::Score { -- cgit v1.2.3-70-g09d2 From 2ec8479cef7475fbc82ffdaf6a7bf658f5c3ac52 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 25 Sep 2009 20:30:05 +0200 Subject: releasing version 0.7.24 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f8e8abecf..94dee639e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.24) UNRELEASED; urgency=low +apt (0.7.24) unstable; urgency=low [ Nicolas François ] * Cleaned up the first patch draft from KURASAWA Nozomu to finally @@ -65,7 +65,7 @@ apt (0.7.24) UNRELEASED; urgency=low * doc/de: dropped (translation is too incomplete to be useful in the transition to the po4a-powered translations) - -- David Kalnischkies Fri, 28 Aug 2009 09:40:08 +0200 + -- Michael Vogt Fri, 25 Sep 2009 19:57:25 +0200 apt (0.7.23.1) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 8ddbb01559ec61f93010642d55b124e7f999f169 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 11:19:29 +0200 Subject: Fix ftp(archive(1) documentation of -o --- debian/changelog | 7 +++++++ doc/apt-ftparchive.1.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 94dee639e..101ad03a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.25) UNRELEASED; urgency=low + + * Fix apt-ftparchive(1) wrt description of the "-o" option. + Thanks to Dann Frazier for the patch. Closes: #273100 + + -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 + apt (0.7.24) unstable; urgency=low [ Nicolas François ] diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 7131303ae..334cc85da 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -39,7 +39,7 @@ - + packagespathoverridepathprefix -- cgit v1.2.3-70-g09d2 From 1cf5e7c9feb1111eb2dc278fdd3aaa2f2708bbf0 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 14:47:15 +0200 Subject: Disable hebrew on translator's request --- debian/changelog | 1 + po/LINGUAS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 101ad03a7..b5c546b59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.7.25) UNRELEASED; urgency=low * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 + * po/LINGUAS. Re-disable Hebrew. Closes: #534992 -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/po/LINGUAS b/po/LINGUAS index 1b7bdef57..2807a7cb6 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW +ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW -- cgit v1.2.3-70-g09d2 From 52f2e1dadd74b6cce8fd72f1a693fb774bfe5cdf Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Sep 2009 15:12:39 +0200 Subject: doc/apt.conf.5.xml: Start deprecating stuff. - Deprecate unquoted values, string concatenation and explain what should not be written inside a value (quotes,backslash). --- debian/changelog | 8 +++++++- doc/apt.conf.5.xml | 7 +++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 101ad03a7..4f8b72a31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ apt (0.7.25) UNRELEASED; urgency=low + [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 - -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 + [ Julian Andres Klode ] + * doc/apt.conf.5.xml: + - Deprecate unquoted values, string concatenation and explain what should + not be written inside a value (quotes,backslash). + + -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 apt (0.7.24) unstable; urgency=low diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e752f9d27..b1522a614 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -59,8 +59,11 @@ between /* and */, just like C/C++ comments. Each line is of the form APT::Get::Assume-Yes "true"; The trailing - semicolon is required and the quotes are optional. A new scope can be - opened with curly braces, like: + semicolon and the quotes are required. The value must be on one line, and + there is no kind of string concatenation. It must not include inside quotes. + The behavior of the backslash "\" and escaped characters inside a value is + undefined and it should not be used. A new scope can be opened with curly + braces, like: APT { -- cgit v1.2.3-70-g09d2 From 31f113db16fc6854be90ca7ec3f7321fd65e99f3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 26 Sep 2009 16:14:54 +0200 Subject: doc/apt.conf.5.xml: Restrict option names to alphanumerical characters and "/-:._+". --- debian/changelog | 1 + doc/apt.conf.5.xml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4f8b72a31..018b072d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/apt.conf.5.xml: - Deprecate unquoted values, string concatenation and explain what should not be written inside a value (quotes,backslash). + - Restrict option names to alphanumerical characters and "/-:._+". -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index b1522a614..661f97ab1 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -62,8 +62,9 @@ semicolon and the quotes are required. The value must be on one line, and there is no kind of string concatenation. It must not include inside quotes. The behavior of the backslash "\" and escaped characters inside a value is - undefined and it should not be used. A new scope can be opened with curly - braces, like: + undefined and it should not be used. An option name may include + alphanumerical characters and the "/-:._+" characters. A new scope can + be opened with curly braces, like: APT { @@ -329,7 +330,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; as specified in /etc/fstab. It is possible to provide alternate mount and unmount commands if your mount point cannot be listed in the fstab (such as an SMB mount and old mount packages). The syntax - is to put "/cdrom/"::Mount "foo"; within + is to put /cdrom/::Mount "foo"; within the cdrom block. It is important to have the trailing slash. Unmount commands can be specified using UMount. -- cgit v1.2.3-70-g09d2 From 847d81b8e95610240f782daeaf154df69b3dd80c Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 19:20:33 +0200 Subject: Fix typo --- debian/changelog | 1 + doc/apt-cache.8.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b5c546b59..98b9981d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ apt (0.7.25) UNRELEASED; urgency=low * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 + * Fix typo in apt-cache.8.xml: nessasarily -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 9851135b1..c61d00e47 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -231,7 +231,7 @@ Reverse Provides: for use in a shell tab complete function and the output is generated extremely quickly. This command is best used with the option. - Note that a package which APT knows of is not nessasarily available to download, + 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 the generated list. -- cgit v1.2.3-70-g09d2 From 7fa2e810e2cec43564c23bd17d5100b355e84593 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 19:27:19 +0200 Subject: Fix typo --- debian/changelog | 1 + doc/apt-get.8.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 98b9981d1..9d3a0a868 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.7.25) UNRELEASED; urgency=low Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 * Fix typo in apt-cache.8.xml: nessasarily + * Fix "with with" in apt-get.8.xml -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index ec773edeb..4735dcd34 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -253,7 +253,7 @@ fetch. It will then find and download into the current directory the newest available version of that source package while respect the default release, set with the option APT::Default-Release, - the option or per package with with the + the option or per package with the pkg/release syntax, if possible. Source packages are tracked separately -- cgit v1.2.3-70-g09d2 From cdd5a135d9232123dc3650ed1c1cb31d1e24de0b Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 19:45:15 +0200 Subject: Fix some typos from #479997 --- cmdline/apt-cdrom.cc | 2 +- debian/changelog | 2 ++ dselect/install | 4 ++-- methods/connect.cc | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 342b6314a..d804c55e5 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -74,7 +74,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text) bool pkgCdromTextStatus::AskCdromName(string &name) { - cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush; + cout << _("Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'") << flush; name = PromptLine(""); return true; diff --git a/debian/changelog b/debian/changelog index 9d3a0a868..60986ffa1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ apt (0.7.25) UNRELEASED; urgency=low * po/LINGUAS. Re-disable Hebrew. Closes: #534992 * Fix typo in apt-cache.8.xml: nessasarily * Fix "with with" in apt-get.8.xml + * Fix some of the typos mentioned by the german team + Closes: #479997 -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/dselect/install b/dselect/install index 61d13208e..6779698e0 100755 --- a/dselect/install +++ b/dselect/install @@ -98,8 +98,8 @@ if [ $RES -eq 0 ]; then ;; esac else - echo $"Some errors occurred while unpacking. I'm going to configure the" - echo $"packages that were installed. This may result in duplicate errors" + echo $"Some errors occurred while unpacking. Packages that were installed" + echo $"will be configured. This may result in duplicate errors" echo $"or errors caused by missing dependencies. This is OK, only the errors" echo $"above this message are important. Please fix them and run [I]nstall again" echo $"Press enter to continue." diff --git a/methods/connect.cc b/methods/connect.cc index 355bd5c4d..b5f48907e 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -237,6 +237,6 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, if (_error->PendingError() == true) return false; - return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr); + return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr); } /*}}}*/ -- cgit v1.2.3-70-g09d2 From 7eade8e91b3df4c3044049bbb178168a9cefa49b Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 20:28:17 +0200 Subject: Enable Asturian translations --- debian/changelog | 1 + po/LINGUAS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 60986ffa1..3f2e3e67b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ apt (0.7.25) UNRELEASED; urgency=low * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 + * po/LINGUAS. Enable Asturian * Fix typo in apt-cache.8.xml: nessasarily * Fix "with with" in apt-get.8.xml * Fix some of the typos mentioned by the german team diff --git a/po/LINGUAS b/po/LINGUAS index 2807a7cb6..59e50ca24 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW +ar ast bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW -- cgit v1.2.3-70-g09d2 From a9a8bf9b6dcdb24bb3a6158d84bd52a56a6e1cf9 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 26 Sep 2009 20:32:58 +0200 Subject: Enable Lithuanian translations --- debian/changelog | 2 +- po/LINGUAS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3f2e3e67b..2dfffac69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ apt (0.7.25) UNRELEASED; urgency=low * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 - * po/LINGUAS. Enable Asturian + * po/LINGUAS. Enable Asturian and Lithuanian * Fix typo in apt-cache.8.xml: nessasarily * Fix "with with" in apt-get.8.xml * Fix some of the typos mentioned by the german team diff --git a/po/LINGUAS b/po/LINGUAS index 59e50ca24..4cf9be5be 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -ar ast bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW +ar ast bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja km ko ku lt mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW -- cgit v1.2.3-70-g09d2 From 6fa6af91e771ffc605108e1bea51c11d4feedaeb Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sun, 27 Sep 2009 17:31:25 +0200 Subject: Polish translation update --- debian/changelog | 2 ++ po/pl.po | 83 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 49 insertions(+), 36 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2dfffac69..8808a4e82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.25) UNRELEASED; urgency=low * Fix "with with" in apt-get.8.xml * Fix some of the typos mentioned by the german team Closes: #479997 + * Polish translation update by Wiktor Wandachowicz + Closes: #548571 -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 diff --git a/po/pl.po b/po/pl.po index 07c046e51..4a1eb7adc 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,16 +2,16 @@ # Polish translation by: # Marcin Owsiany , 2002, 2003, 2004. # Bartosz Fenski , 2005, 2006 -# Wiktor Wandachowicz , 2008 +# Wiktor Wandachowicz , 2008, 2009 # # Nazewnictwo i spójność tłumaczeń programów apt, aptitude, synaptic i innych: # http://wiki.debian.org/PolishL10N/PackageInstallers msgid "" msgstr "" -"Project-Id-Version: apt 0.7.14\n" +"Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-26 11:38+0200\n" -"PO-Revision-Date: 2008-11-13 17:10+0100\n" +"POT-Creation-Date: 2009-09-26 13:54+0200\n" +"PO-Revision-Date: 2009-09-27 03:42+0100\n" "Last-Translator: Wiktor Wandachowicz \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -1000,7 +1000,7 @@ msgstr "Wybrano wersję %s (%s) dla %s\n" #: cmdline/apt-get.cc:1348 #, c-format msgid "No source package '%s' picking '%s' instead\n" -msgstr "" +msgstr "Brak pakietu źródłowego \"%s\", wybieranie \"%s\" zamiast niego\n" #: cmdline/apt-get.cc:1385 msgid "The update command takes no arguments" @@ -1023,11 +1023,11 @@ msgstr "" "wymagane:" #: cmdline/apt-get.cc:1505 -#, fuzzy, c-format +#, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -"Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " -"wymagane:" +"%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej " +"wymagane.\n" #: cmdline/apt-get.cc:1506 msgid "Use 'apt-get autoremove' to remove them." @@ -1207,18 +1207,17 @@ msgstr "Proces potomny zawiódł" msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " -"zależności na czas budowania" +"zależności dla budowania" #: cmdline/apt-get.cc:2415 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "" -"Nie udało się pobrać informacji o zależnościach na czas budowania dla %s" +msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" #: cmdline/apt-get.cc:2435 #, c-format msgid "%s has no build depends.\n" -msgstr "%s nie ma zależności czasu budowania.\n" +msgstr "%s nie ma zależności dla budowania.\n" #: cmdline/apt-get.cc:2487 #, c-format @@ -1253,18 +1252,17 @@ msgstr "Nie udało się spełnić zależności %s od %s: %s" #: cmdline/apt-get.cc:2619 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Nie udało się spełnić zależności na czas budowania od %s." +msgstr "Nie udało się spełnić zależności dla budowania %s." #: cmdline/apt-get.cc:2624 msgid "Failed to process build dependencies" -msgstr "Nie udało się przetworzyć zależności na czas budowania" +msgstr "Nie udało się przetworzyć zależności dla budowania" #: cmdline/apt-get.cc:2656 msgid "Supported modules:" msgstr "Obsługiwane moduły:" #: cmdline/apt-get.cc:2697 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1322,8 +1320,7 @@ msgstr "" " autoremove - Usuwa automatycznie wszystkie nieużywane pakiety\n" " purge - Usuwa i czyści pakiety\n" " source - Pobiera archiwa źródłowe\n" -" build-dep - Konfiguruje zależności na czas budowania dla pakietów " -"źródłowych\n" +" build-dep - Konfiguruje zależności dla budowania pakietów źródłowych\n" " dist-upgrade - Aktualizacja dystrybucji, patrz apt-get(8)\n" " dselect-upgrade - Instaluje według wyborów dselect\n" " clean - Usuwa pobrane pliki archiwów\n" @@ -1344,7 +1341,7 @@ msgstr "" " -b Buduje pakiet po pobraniu archiwum źródłowego\n" " -V Pokazuje pełną informację na temat wersji\n" " -c=? Czyta wskazany plik konfiguracyjny.\n" -" -o=? Ustawie dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" +" -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" "Więcej informacji i opcji można znaleźć na stronach podręcznika\n" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" @@ -1356,6 +1353,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" +"UWAGA: To jest tylko symulacja!\n" +" apt-get wymaga normalnie praw administracyjnych dla działania.\n" +" Aktualnie blokowanie jest wyłączone, więc nie należy polegać\n" +" na związku z rzeczywistą sytuacją!" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1491,6 +1492,7 @@ msgstr "Błąd przy czytaniu nagłówka składnika archiwum" #: apt-inst/contrib/arfile.cc:90 #, fuzzy, c-format +#| msgid "Invalid archive member header" msgid "Invalid archive member header %s" msgstr "Nieprawidłowy nagłówek składnika archiwum" @@ -2131,30 +2133,32 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +"Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" +"Limit. Aktualna wartość: %lu. (man 5 apt.conf)" #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%lidni %lih %limin %lis" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:353 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%lih %limin %lis" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:360 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%limin %lis" #. s means seconds #: apt-pkg/contrib/strutl.cc:365 #, c-format msgid "%lis" -msgstr "" +msgstr "%lis" #: apt-pkg/contrib/strutl.cc:1040 #, c-format @@ -2314,9 +2318,9 @@ msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie segmentacji." #: apt-pkg/contrib/fileutl.cc:458 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "Podproces %s spowodował naruszenie segmentacji." +msgstr "Podproces %s dostał sygnał %u." #: apt-pkg/contrib/fileutl.cc:462 #, c-format @@ -2410,7 +2414,7 @@ msgstr "Psuje" #: apt-pkg/pkgcache.cc:227 msgid "Enhances" -msgstr "" +msgstr "Rozszerza" #: apt-pkg/pkgcache.cc:238 msgid "important" @@ -2626,9 +2630,9 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Należy uruchomić apt-get update aby naprawić te problemy." #: apt-pkg/policy.cc:347 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Nieprawidłowe informacje w pliku ustawień, brak nagłówka Package" +msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" #: apt-pkg/policy.cc:369 #, c-format @@ -2782,19 +2786,19 @@ msgid "Size mismatch" msgstr "Błędny rozmiar" #: apt-pkg/indexrecords.cc:40 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "Nie udało się zanalizować pliku pakietu %s (1)" +msgstr "Nie udało się zanalizować pliku Release %s" #: apt-pkg/indexrecords.cc:47 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "Uwaga, wybieranie %s zamiast %s\n" +msgstr "Brak sekcji w pliku Release %s" #: apt-pkg/indexrecords.cc:81 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "Brak wpisu Hash w pliku Release %s" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2859,6 +2863,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"Nie można odnaleźć żadnych plików pakietów, być może nie jest to dysk " +"Debiana lub inna architektura?" #: apt-pkg/cdrom.cc:710 #, c-format @@ -2983,7 +2989,7 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:907 msgid "Running dpkg" -msgstr "" +msgstr "Uruchamianie dpkg" #: apt-pkg/deb/debsystem.cc:70 #, c-format @@ -2991,21 +2997,26 @@ msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" +"Nie udało się zablokować katalogu administracyjnego (%s), czy inny proces go " +"używa?" #: apt-pkg/deb/debsystem.cc:73 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Nie udało się zablokować katalogu list" +msgstr "" +"Nie udało się zablokować katalogu administracyjnego (%s), czy jesteś rootem?" #: apt-pkg/deb/debsystem.cc:82 msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " msgstr "" +"dpkg został przerwany, należy ręcznie uruchomić \"dpkg --configure -a\" aby " +"naprawić problem." #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -msgstr "" +msgstr "Nie zablokowany" #: methods/rred.cc:219 msgid "Could not patch file" -- cgit v1.2.3-70-g09d2 From 334459abb1f5fa7f8a6be694cf9ecb05d692f01e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 28 Sep 2009 15:21:08 +0200 Subject: doc/apt.conf.5.xml: Deprecate #include, we have apt.conf.d nowadays which should be sufficient. --- debian/changelog | 2 ++ doc/apt.conf.5.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 018b072d8..10e70b8d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.7.25) UNRELEASED; urgency=low - Deprecate unquoted values, string concatenation and explain what should not be written inside a value (quotes,backslash). - Restrict option names to alphanumerical characters and "/-:._+". + - Deprecate #include, we have apt.conf.d nowadays which should be + sufficient. -- Julian Andres Klode Sat, 26 Sep 2009 15:00:28 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 661f97ab1..a12524328 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -95,7 +95,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; new entry will simply add a new option to the list. If you specify a name you can override the option as every other option by reassigning a new value to the option. - Two specials are allowed, #include and #clear: + Two specials are allowed, #include (which is deprecated + and not supported by alternative implementations) and #clear: #include will include the given file, unless the filename ends in a slash, then the whole directory is included. #clear is used to erase a part of the configuration tree. The -- cgit v1.2.3-70-g09d2 From d183f850e7e3e467e8665d116ffbb238fdcc4ea9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Sep 2009 15:51:48 +0200 Subject: * apt-pkg/packagemanager.cc: - fix overly aggressive immediate config propergation (thanks to David Kalnischkies) --- apt-pkg/packagemanager.cc | 10 +++++++--- apt-pkg/packagemanager.h | 2 +- debian/changelog | 8 +++++++- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 442143516..dbcd461ac 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -125,7 +125,7 @@ bool pkgPackageManager::FixMissing() /* This adds the immediate flag to the pkg and recursively to the dependendies */ -void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer) +void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth) { DepIterator D; @@ -143,12 +143,16 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer) for ( /* nothing */ ; D.end() == false; D++) if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends) { + // ignore dependencies if no instal/upgrade/remove is going to happen + if (D.TargetPkg() == 0 || Cache[D.TargetPkg()].Keep()) + continue; + if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate)) { if(Debug) - clog << "ImmediateAdd(): Adding Immediate flag to " << I.Name() << endl; + clog << OutputInDepth(Depth) << "ImmediateAdd(): Adding Immediate flag to " << D.TargetPkg() << " cause of " << D.DepType() << " " << I.Name() << endl; List->Flag(D.TargetPkg(),pkgOrderList::Immediate); - ImmediateAdd(D.TargetPkg(), UseInstallVer); + ImmediateAdd(D.TargetPkg(), UseInstallVer, Depth + 1); } } return; diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h index a1bfdc52d..af1476b7a 100644 --- a/apt-pkg/packagemanager.h +++ b/apt-pkg/packagemanager.h @@ -49,7 +49,7 @@ class pkgPackageManager : protected pkgCache::Namespace bool Debug; bool DepAdd(pkgOrderList &Order,PkgIterator P,int Depth = 0); - void ImmediateAdd(PkgIterator P, bool UseInstallVer); + void ImmediateAdd(PkgIterator P, bool UseInstallVer, unsigned const int &Depth = 0); virtual OrderResult OrderInstall(); bool CheckRConflicts(PkgIterator Pkg,DepIterator Dep,const char *Ver); bool CreateOrderList(); diff --git a/debian/changelog b/debian/changelog index 8808a4e82..9da06b054 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ apt (0.7.25) UNRELEASED; urgency=low + [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 @@ -10,8 +11,13 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #479997 * Polish translation update by Wiktor Wandachowicz Closes: #548571 + + [ Michael Vogt ] + * apt-pkg/packagemanager.cc: + - fix overly aggressive immediate config propergation + (thanks to David Kalnischkies) - -- Christian Perrier Sat, 26 Sep 2009 11:17:25 +0200 + -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 apt (0.7.24) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From c3bf63f2a9194d354ed8716f27a75e38cbe3b858 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 1 Oct 2009 20:28:23 +0200 Subject: add a log of the changes made to debian/changelog --- debian/changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9da06b054..ae75918b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,11 +11,12 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #479997 * Polish translation update by Wiktor Wandachowicz Closes: #548571 - - [ Michael Vogt ] + + [ David Kalnischkies ] * apt-pkg/packagemanager.cc: - - fix overly aggressive immediate config propergation - (thanks to David Kalnischkies) + - better debug output for ImmediateAdd with depth and why + * doc/guide.it.sgml: moved to doc/it/guide.it.sgml + * doc/po4a.conf: activate translation of guide.sgml and offline.sgml -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 -- cgit v1.2.3-70-g09d2 From f66a64c26cb60656255c89fcd4fc757422d9545a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 1 Oct 2009 20:32:55 +0200 Subject: improve the documentation and errormessages regarding a failing immediate configuration as the old message was quite a bit scare and uninformative. --- apt-pkg/packagemanager.cc | 6 +- debian/changelog | 3 + doc/apt.conf.5.xml | 21 ++- doc/po/apt-doc.pot | 367 ++++++++++++++++++++++--------------------- doc/po/fr.po | 387 ++++++++++++++++++++++++---------------------- doc/po/ja.po | 387 ++++++++++++++++++++++++---------------------- po/apt-all.pot | 16 +- 7 files changed, 642 insertions(+), 545 deletions(-) (limited to 'debian') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index e51021b39..f75c5b61f 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -471,7 +471,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name()); + return _error->Error(_("Could not perform immediate configuration for on already unpacked %s." + "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name()); return true; } @@ -571,7 +572,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) // Perform immedate configuration of the package. if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); + return _error->Error(_("Could not perform immediate configuration on %s." + "Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name()); return true; } diff --git a/debian/changelog b/debian/changelog index ae75918b0..17a770b73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,11 @@ apt (0.7.25) UNRELEASED; urgency=low [ David Kalnischkies ] * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why + - improve the message shown for failing immediate configuration * doc/guide.it.sgml: moved to doc/it/guide.it.sgml * doc/po4a.conf: activate translation of guide.sgml and offline.sgml + * doc/apt.conf.5.xml: + - provide a few more details about APT::Immediate-Configure -- Michael Vogt Tue, 29 Sep 2009 15:51:34 +0200 diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e752f9d27..36b65b073 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -151,11 +151,22 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Immediate-Configure - Disable Immediate Configuration; This dangerous option disables some - of APT's ordering code to cause it to make fewer dpkg calls. Doing - so may be necessary on some extremely slow single user systems but - is very dangerous and may cause package install scripts to fail or worse. - Use at your own risk. + Defaults to on which will cause APT to install essential and important packages + as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing + &dpkg; call: If this option is disabled APT doesn't treat an important package in the same way as + an extra package: Between the unpacking of the important package A and his configuration can then + be many other unpack or configuration calls, e.g. for package B which has no relation to A, but + causes the dpkg call to fail (e.g. because maintainer script of package B generates an error) which results + in a system state in which package A is unpacked but unconfigured - each package depending on A is now no + longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker + is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle + as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible + that APT encounters a situation in which it is unable to perform immediate configuration, error out and + refers to this option so the user can deactivate the immediate configuration temporary to be able to perform + an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now + in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package + in question, so you should not blindly disable this option as the mentioned scenario above is not the only + problem immediate configuration can help to prevent in the first place. Force-LoopBreak diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 82a4afe67..0037b235b 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-10-01 18:09+0300\n" +"POT-Creation-Date: 2009-10-01 20:13+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1218,7 +1218,7 @@ msgid "" msgstr "" #. type: Content of: -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:447 apt.conf.5.xml:469 msgid "options" msgstr "" @@ -1416,7 +1416,7 @@ msgid "&apt-commonoptions;" msgstr "" #. type: Content of: -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:968 apt_preferences.5.xml:615 +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:979 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1426,7 +1426,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 sources.list.5.xml:221 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:985 apt_preferences.5.xml:622 sources.list.5.xml:221 msgid "See Also" msgstr "" @@ -2681,7 +2681,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 sources.list.5.xml:181 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:973 apt_preferences.5.xml:462 sources.list.5.xml:181 msgid "Examples" msgstr "" @@ -4403,20 +4403,37 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:154 msgid "" -"Disable Immediate Configuration; This dangerous option disables some of " -"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " -"necessary on some extremely slow single user systems but is very dangerous " -"and may cause package install scripts to fail or worse. Use at your own " -"risk." -msgstr "" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:161 +"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 " +"doesn't treat an important package in the same way as an extra package: " +"Between the unpacking of the important package A and his configuration can " +"then be many other unpack or configuration calls, e.g. for package B which " +"has no relation to A, but causes the dpkg call to fail (e.g. because " +"maintainer script of package B generates an error) which results in a system " +"state in which package A is unpacked but unconfigured - each package " +"depending on A is now no longer guaranteed to work as their dependency on A " +"is not longer satisfied. The immediate configuration marker is also applied " +"to all dependencies which can generate a problem if the dependencies " +"e.g. form a circle as a dependency with the immediate flag is comparable " +"with a Pre-Dependency. So in theory it is possible that APT encounters a " +"situation in which it is unable to perform immediate configuration, error " +"out and refers to this option so the user can deactivate the immediate " +"configuration temporary to be able to perform an install/upgrade again. Note " +"the use of the word \"theory\" here as this problem was only encountered by " +"now in real world a few times in non-stable distribution versions and caused " +"by wrong dependencies of the package in question, so you should not blindly " +"disable this option as the mentioned scenario above is not the only problem " +"immediate configuration can help to prevent in the first place." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:172 msgid "Force-LoopBreak" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:162 +#: apt.conf.5.xml:173 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 " @@ -4427,87 +4444,87 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:170 +#: apt.conf.5.xml:181 msgid "Cache-Limit" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:182 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:186 msgid "Build-Essential" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:187 msgid "Defines which package(s) are considered essential build dependencies." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:179 +#: apt.conf.5.xml:190 msgid "Get" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:191 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:184 +#: apt.conf.5.xml:195 msgid "Cache" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:185 +#: apt.conf.5.xml:196 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:189 +#: apt.conf.5.xml:200 msgid "CDROM" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 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:196 +#: apt.conf.5.xml:207 msgid "The Acquire Group" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:201 +#: apt.conf.5.xml:212 msgid "PDiffs" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:202 +#: apt.conf.5.xml:213 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:218 msgid "Queue-Mode" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:219 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of " "<literal>host</literal> or <literal>access</literal> which determines how " @@ -4517,36 +4534,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:226 msgid "Retries" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 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:220 +#: apt.conf.5.xml:231 msgid "Source-Symlinks" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 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:225 sources.list.5.xml:139 +#: apt.conf.5.xml:236 sources.list.5.xml:139 msgid "http" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:226 +#: apt.conf.5.xml:237 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 " @@ -4558,7 +4575,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 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 " @@ -4572,7 +4589,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:244 apt.conf.5.xml:301 +#: apt.conf.5.xml:255 apt.conf.5.xml:312 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4580,7 +4597,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 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) " @@ -4592,7 +4609,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:255 +#: apt.conf.5.xml:266 msgid "" "The used bandwidth can be limited with " "<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in " @@ -4602,12 +4619,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:262 +#: apt.conf.5.xml:273 msgid "" "HTTPS URIs. Cache-control and proxy options are the same as for " "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " @@ -4615,7 +4632,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:266 +#: apt.conf.5.xml:277 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4637,12 +4654,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:284 sources.list.5.xml:150 +#: apt.conf.5.xml:295 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:296 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 " @@ -4662,7 +4679,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:315 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 " @@ -4672,7 +4689,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:322 msgid "" "It is possible to proxy FTP over HTTP by setting the " "<envar>ftp_proxy</envar> environment variable to a http url - see the " @@ -4682,7 +4699,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:327 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4692,18 +4709,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:323 sources.list.5.xml:132 +#: apt.conf.5.xml:334 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:340 #, no-wrap msgid "\"/cdrom/\"::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:335 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 " @@ -4716,12 +4733,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:345 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:335 +#: apt.conf.5.xml:346 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4729,12 +4746,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:340 +#: apt.conf.5.xml:351 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:357 #, no-wrap msgid "" "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> " @@ -4742,7 +4759,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:341 +#: apt.conf.5.xml:352 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4754,19 +4771,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:362 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:365 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:347 +#: apt.conf.5.xml:358 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 " @@ -4783,13 +4800,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:367 msgid "" "Note that at run time the " "<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be " @@ -4804,7 +4821,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4814,7 +4831,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:197 +#: apt.conf.5.xml:208 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" " @@ -4822,12 +4839,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:372 +#: apt.conf.5.xml:383 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4839,7 +4856,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4852,7 +4869,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4862,7 +4879,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:396 +#: apt.conf.5.xml:407 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 " @@ -4870,7 +4887,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:400 +#: apt.conf.5.xml:411 msgid "" "Binary programs are pointed to by " "<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies " @@ -4882,7 +4899,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:408 +#: apt.conf.5.xml:419 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4895,12 +4912,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:432 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:423 +#: apt.conf.5.xml:434 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4908,12 +4925,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:439 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 " @@ -4924,50 +4941,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:448 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:441 +#: apt.conf.5.xml:452 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:453 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:446 +#: apt.conf.5.xml:457 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:458 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:453 +#: apt.conf.5.xml:464 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:465 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:459 +#: apt.conf.5.xml:470 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 " @@ -4975,17 +4992,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:475 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:475 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:465 +#: apt.conf.5.xml:476 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 " @@ -4994,12 +5011,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:482 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:472 +#: apt.conf.5.xml:483 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 " @@ -5009,7 +5026,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5020,36 +5037,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:496 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:497 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:490 +#: apt.conf.5.xml:501 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:502 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:496 +#: apt.conf.5.xml:507 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5064,7 +5081,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:523 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5074,7 +5091,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:517 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 " @@ -5088,12 +5105,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:518 +#: apt.conf.5.xml:529 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -5105,12 +5122,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5127,12 +5144,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:548 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:549 msgid "" "If this option is set apt will call <command>dpkg --configure " "--pending</command> to let dpkg handle all required configurations and " @@ -5144,12 +5161,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:555 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5159,12 +5176,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:561 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 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 " @@ -5176,12 +5193,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:569 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:577 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5193,7 +5210,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:570 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 " @@ -5207,12 +5224,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:590 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:591 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5221,12 +5238,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:599 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:601 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5237,7 +5254,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:612 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, " @@ -5245,7 +5262,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:620 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s " @@ -5253,7 +5270,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:629 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5263,110 +5280,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:626 +#: apt.conf.5.xml:637 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:636 +#: apt.conf.5.xml:647 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:641 +#: apt.conf.5.xml:652 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:645 +#: apt.conf.5.xml:656 msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:652 +#: apt.conf.5.xml:663 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:667 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:663 +#: apt.conf.5.xml:674 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:667 +#: apt.conf.5.xml:678 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:685 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:678 +#: apt.conf.5.xml:689 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:696 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:689 +#: apt.conf.5.xml:700 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:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 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:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:721 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:717 +#: apt.conf.5.xml:728 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:731 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:727 +#: apt.conf.5.xml:738 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:741 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 " @@ -5374,92 +5391,92 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:738 +#: apt.conf.5.xml:749 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:752 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:749 +#: apt.conf.5.xml:760 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:764 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:760 +#: apt.conf.5.xml:771 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:763 +#: apt.conf.5.xml:774 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:770 +#: apt.conf.5.xml:781 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:784 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:781 +#: apt.conf.5.xml:792 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:785 +#: apt.conf.5.xml:796 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:792 +#: apt.conf.5.xml:803 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:796 +#: apt.conf.5.xml:807 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:803 +#: apt.conf.5.xml:814 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:818 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:814 +#: apt.conf.5.xml:825 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:817 +#: apt.conf.5.xml:828 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial " @@ -5469,12 +5486,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:831 +#: apt.conf.5.xml:842 msgid "" "Generate debug messages describing which package is marked as " "keep/install/remove while the ProblemResolver does his work. Each addition " @@ -5492,90 +5509,90 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:850 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:853 +#: apt.conf.5.xml:864 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:871 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:863 +#: apt.conf.5.xml:874 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:871 +#: apt.conf.5.xml:882 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:885 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:881 +#: apt.conf.5.xml:892 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:885 +#: apt.conf.5.xml:896 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:893 +#: apt.conf.5.xml:904 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:908 msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 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:926 +#: apt.conf.5.xml:937 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:929 +#: apt.conf.5.xml:940 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 " @@ -5583,32 +5600,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:948 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:952 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:963 +#: apt.conf.5.xml:974 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:981 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:975 +#: apt.conf.5.xml:986 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 738408312..ba229a6e3 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-10-01 18:09+0300\n" +"POT-Creation-Date: 2009-10-01 20:13+0300\n" "PO-Revision-Date: 2009-09-26 19:25+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1677,7 +1677,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:447 apt.conf.5.xml:469 msgid "options" msgstr "options" @@ -1923,7 +1923,7 @@ msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:968 apt_preferences.5.xml:615 +#: apt.conf.5.xml:979 apt_preferences.5.xml:615 msgid "Files" msgstr "Fichiers" @@ -1936,7 +1936,7 @@ msgstr "&file-sourceslist; &file-statelists;" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:985 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "Voir aussi" @@ -3523,7 +3523,7 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:973 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "Exemples" @@ -5842,26 +5842,37 @@ msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:154 msgid "" -"Disable Immediate Configuration; This dangerous option disables some of " -"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " -"necessary on some extremely slow single user systems but is very dangerous " -"and may cause package install scripts to fail or worse. Use at your own " -"risk." -msgstr "" -"Désactive la configuration immédiate ; cette dangereuse option désactive une " -"partie du code de mise en ordre de APT pour que ce dernier effectue le moins " -"d'appels possible à &dpkg;. Ça peut être nécessaire sur des systèmes à un " -"seul utilisateur extrêmement lents, mais cette option est très dangereuse et " -"peut faire échouer les scripts d'installation, voire pire. Utilisez-la à " -"vos risques et périls." - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:161 +"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 " +"doesn't treat an important package in the same way as an extra package: " +"Between the unpacking of the important package A and his configuration can " +"then be many other unpack or configuration calls, e.g. for package B which " +"has no relation to A, but causes the dpkg call to fail (e.g. because " +"maintainer script of package B generates an error) which results in a system " +"state in which package A is unpacked but unconfigured - each package " +"depending on A is now no longer guaranteed to work as their dependency on A " +"is not longer satisfied. The immediate configuration marker is also applied " +"to all dependencies which can generate a problem if the dependencies e.g. " +"form a circle as a dependency with the immediate flag is comparable with a " +"Pre-Dependency. So in theory it is possible that APT encounters a situation " +"in which it is unable to perform immediate configuration, error out and " +"refers to this option so the user can deactivate the immediate configuration " +"temporary to be able to perform an install/upgrade again. Note the use of " +"the word \"theory\" here as this problem was only encountered by now in real " +"world a few times in non-stable distribution versions and caused by wrong " +"dependencies of the package in question, so you should not blindly disable " +"this option as the mentioned scenario above is not the only problem " +"immediate configuration can help to prevent in the first place." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:172 msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:162 +#: apt.conf.5.xml:173 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/" @@ -5879,12 +5890,12 @@ msgstr "" "ces paquets dépendent." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:170 +#: apt.conf.5.xml:181 msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:182 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -5894,24 +5905,24 @@ msgstr "" "mémoire allouée pour le chargement de ce cache." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:186 msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:176 +#: apt.conf.5.xml:187 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:179 +#: apt.conf.5.xml:190 msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:180 +#: apt.conf.5.xml:191 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -5921,12 +5932,12 @@ msgstr "" "question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:195 msgid "Cache" msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:185 +#: apt.conf.5.xml:196 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -5936,12 +5947,12 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:189 +#: apt.conf.5.xml:200 msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:190 +#: apt.conf.5.xml:201 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -5951,17 +5962,17 @@ msgstr "" "options en question." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "The Acquire Group" msgstr "Le groupe Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:201 +#: apt.conf.5.xml:212 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:202 +#: apt.conf.5.xml:213 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -5971,12 +5982,12 @@ msgstr "" "télécharger entièrement. Par défaut à « true »." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:218 msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:208 +#: apt.conf.5.xml:219 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -5992,12 +6003,12 @@ msgstr "" "initiée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:226 msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:216 +#: apt.conf.5.xml:227 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6007,12 +6018,12 @@ msgstr "" "échoué." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:220 +#: apt.conf.5.xml:231 msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:221 +#: apt.conf.5.xml:232 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." @@ -6022,12 +6033,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:225 sources.list.5.xml:139 +#: apt.conf.5.xml:236 sources.list.5.xml:139 msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:226 +#: apt.conf.5.xml:237 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -6054,7 +6065,7 @@ msgstr "" "les options de mandataire HTTP." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:234 +#: apt.conf.5.xml:245 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 " @@ -6079,7 +6090,7 @@ msgstr "" "en compte aucune de ces options." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:244 apt.conf.5.xml:301 +#: apt.conf.5.xml:255 apt.conf.5.xml:312 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6089,7 +6100,7 @@ msgstr "" "(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:247 +#: apt.conf.5.xml:258 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) " @@ -6109,7 +6120,7 @@ msgstr "" "option ne respectent pas la RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:255 +#: apt.conf.5.xml:266 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 " @@ -6119,12 +6130,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:262 +#: apt.conf.5.xml:273 msgid "" "HTTPS URIs. Cache-control and proxy options are the same as for " "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " @@ -6135,7 +6146,7 @@ msgstr "" "<literal>Pipeline-Depth</literal> n'est pas encore supportée." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:266 +#: apt.conf.5.xml:277 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6167,12 +6178,12 @@ msgstr "" "ou 'SSLv3'." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:284 sources.list.5.xml:150 +#: apt.conf.5.xml:295 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:296 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@ -6220,7 +6231,7 @@ msgstr "" "respectif de l'URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:304 +#: apt.conf.5.xml:315 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 " @@ -6237,7 +6248,7 @@ msgstr "" "modèle de fichier de configuration)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:311 +#: apt.conf.5.xml:322 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 " @@ -6252,7 +6263,7 @@ msgstr "" "de cette méthode." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:327 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6268,18 +6279,18 @@ msgstr "" "des serveurs FTP ne suivent pas la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:323 sources.list.5.xml:132 +#: apt.conf.5.xml:334 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:340 #, no-wrap msgid "\"/cdrom/\"::Mount \"foo\";" msgstr "\"/cdrom/\"::Mount \"foo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:335 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 " @@ -6301,12 +6312,12 @@ msgstr "" "spécifiées en utilisant <literal>UMount</literal>." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:345 msgid "gpgv" msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:335 +#: apt.conf.5.xml:346 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6317,18 +6328,18 @@ msgstr "" "supplémentaires passées à gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:340 +#: apt.conf.5.xml:351 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:357 #, 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:341 +#: apt.conf.5.xml:352 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6340,19 +6351,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:362 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:365 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:347 +#: apt.conf.5.xml:358 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 " @@ -6369,13 +6380,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:367 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6390,7 +6401,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6400,7 +6411,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:197 +#: apt.conf.5.xml:208 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6410,12 +6421,12 @@ msgstr "" "id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:372 +#: apt.conf.5.xml:383 msgid "Directories" msgstr "Les répertoires" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6435,7 +6446,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6458,7 +6469,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6473,7 +6484,7 @@ msgstr "" "fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:396 +#: apt.conf.5.xml:407 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 " @@ -6484,7 +6495,7 @@ msgstr "" "configuration est chargé." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:400 +#: apt.conf.5.xml:411 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@ -6509,7 +6520,7 @@ msgstr "" "l'emplacement des programmes correspondants." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:408 +#: apt.conf.5.xml:419 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6531,12 +6542,12 @@ msgstr "" "staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:432 msgid "APT in DSelect" msgstr "APT et DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:423 +#: apt.conf.5.xml:434 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6547,12 +6558,12 @@ msgstr "" "<literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 msgid "Clean" msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:439 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 " @@ -6570,7 +6581,7 @@ msgstr "" "supprime avant de récupérer de nouveaux paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:448 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6579,12 +6590,12 @@ msgstr "" "&apt-get; lors de la phase d'installation." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:452 msgid "Updateoptions" msgstr "UpdateOptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:442 +#: apt.conf.5.xml:453 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6593,12 +6604,12 @@ msgstr "" "&apt-get; lors de la phase de mise à jour." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:446 +#: apt.conf.5.xml:457 msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:458 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6608,12 +6619,12 @@ msgstr "" "d'erreur que l'on propose à l'utilisateur d'intervenir." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:453 +#: apt.conf.5.xml:464 msgid "How APT calls dpkg" msgstr "Méthode d'appel de &dpkg; par APT" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:465 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6622,7 +6633,7 @@ msgstr "" "&dpkg; : elles figurent dans la section <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:470 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 " @@ -6633,17 +6644,17 @@ msgstr "" "est passé comme un seul paramètre à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:475 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:475 msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:465 +#: apt.conf.5.xml:476 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 " @@ -6656,12 +6667,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:471 +#: apt.conf.5.xml:482 msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:472 +#: apt.conf.5.xml:483 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 " @@ -6677,7 +6688,7 @@ msgstr "" "qu'il va installer, à raison d'un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6693,12 +6704,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:496 msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:486 +#: apt.conf.5.xml:497 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6707,12 +6718,12 @@ msgstr "" "le répertoire <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:501 msgid "Build-options" msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:502 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6722,12 +6733,12 @@ msgstr "" "créés." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -6742,7 +6753,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:523 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6752,7 +6763,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:517 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 " @@ -6766,12 +6777,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:518 +#: apt.conf.5.xml:529 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -6783,14 +6794,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6806,12 +6817,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:548 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:549 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6822,12 +6833,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:555 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6837,12 +6848,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:561 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 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-" @@ -6854,12 +6865,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:569 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:577 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6871,7 +6882,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:570 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 " @@ -6885,12 +6896,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:590 msgid "Periodic and Archives options" msgstr "Options « Periodic » et « Archive »" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:591 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6902,12 +6913,12 @@ msgstr "" "script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:599 msgid "Debug options" msgstr "Les options de débogage" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:601 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6925,7 +6936,7 @@ msgstr "" "peuvent tout de même être utiles :" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:612 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6936,7 +6947,7 @@ msgstr "" "upgrade, upgrade, install, remove et purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:620 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6948,7 +6959,7 @@ msgstr "" "superutilisateur." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:629 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6960,7 +6971,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:626 +#: apt.conf.5.xml:637 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." @@ -6969,17 +6980,17 @@ msgstr "" "type statfs dans les identifiants de CD." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:636 +#: apt.conf.5.xml:647 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:641 +#: apt.conf.5.xml:652 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:645 +#: apt.conf.5.xml:656 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" @@ -6987,44 +6998,44 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:652 +#: apt.conf.5.xml:663 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:656 +#: apt.conf.5.xml:667 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:663 +#: apt.conf.5.xml:674 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:667 +#: apt.conf.5.xml:678 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:674 +#: apt.conf.5.xml:685 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:678 +#: apt.conf.5.xml:689 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:685 +#: apt.conf.5.xml:696 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:689 +#: apt.conf.5.xml:700 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7033,12 +7044,12 @@ msgstr "" "cryptographiques avec <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." @@ -7047,24 +7058,24 @@ msgstr "" "stockées sur CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:721 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:717 +#: apt.conf.5.xml:728 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:731 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." @@ -7073,12 +7084,12 @@ msgstr "" "librairies d'<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:738 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:741 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 " @@ -7089,12 +7100,12 @@ msgstr "" "utilisés sur le système de fichier du CD." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:738 +#: apt.conf.5.xml:749 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:752 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." @@ -7104,24 +7115,24 @@ msgstr "" "temps." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:749 +#: apt.conf.5.xml:760 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:764 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:760 +#: apt.conf.5.xml:771 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:763 +#: apt.conf.5.xml:774 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." @@ -7131,12 +7142,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:770 +#: apt.conf.5.xml:781 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:773 +#: apt.conf.5.xml:784 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." @@ -7146,12 +7157,12 @@ msgstr "" "éventuelles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:781 +#: apt.conf.5.xml:792 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:785 +#: apt.conf.5.xml:796 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." @@ -7161,12 +7172,12 @@ msgstr "" "place des fichiers complets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:792 +#: apt.conf.5.xml:803 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:796 +#: apt.conf.5.xml:807 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" @@ -7174,12 +7185,12 @@ msgstr "" "effectivement des téléchargements." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:803 +#: apt.conf.5.xml:814 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:818 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." @@ -7188,12 +7199,12 @@ msgstr "" "automatiquement, et la suppression des paquets inutiles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:814 +#: apt.conf.5.xml:825 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:817 +#: apt.conf.5.xml:828 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7208,12 +7219,12 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 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:831 +#: apt.conf.5.xml:842 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7248,24 +7259,24 @@ msgstr "" "de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:850 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:853 +#: apt.conf.5.xml:864 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:860 +#: apt.conf.5.xml:871 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:863 +#: apt.conf.5.xml:874 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." @@ -7274,12 +7285,12 @@ msgstr "" "paramètres sont séparés par des espaces." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:871 +#: apt.conf.5.xml:882 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:885 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." @@ -7289,12 +7300,12 @@ msgstr "" "fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:881 +#: apt.conf.5.xml:892 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:885 +#: apt.conf.5.xml:896 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." @@ -7303,33 +7314,33 @@ msgstr "" "<literal>apt</literal> passe les paquets à &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:893 +#: apt.conf.5.xml:904 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:908 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:904 +#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 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:914 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." @@ -7338,12 +7349,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:926 +#: apt.conf.5.xml:937 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:929 +#: apt.conf.5.xml:940 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 " @@ -7354,12 +7365,12 @@ msgstr "" "est décrite dans <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:948 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:952 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7368,7 +7379,7 @@ msgstr "" "list</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7377,7 +7388,7 @@ msgstr "" "exemples pour toutes les options existantes." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:981 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7385,7 +7396,7 @@ msgstr "&apt-conf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:975 +#: apt.conf.5.xml:986 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -10123,6 +10134,20 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" +#~ msgid "" +#~ "Disable Immediate Configuration; This dangerous option disables some of " +#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " +#~ "necessary on some extremely slow single user systems but is very " +#~ "dangerous and may cause package install scripts to fail or worse. Use at " +#~ "your own risk." +#~ msgstr "" +#~ "Désactive la configuration immédiate ; cette dangereuse option désactive " +#~ "une partie du code de mise en ordre de APT pour que ce dernier effectue " +#~ "le moins d'appels possible à &dpkg;. Ça peut être nécessaire sur des " +#~ "systèmes à un seul utilisateur extrêmement lents, mais cette option est " +#~ "très dangereuse et peut faire échouer les scripts d'installation, voire " +#~ "pire. Utilisez-la à vos risques et périls." + #~ msgid "<filename>/etc/apt/sources.list</filename>" #~ msgstr "<filename>/etc/apt/sources.list</filename>" diff --git a/doc/po/ja.po b/doc/po/ja.po index 0cceb0909..f417fefcc 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-10-01 18:09+0300\n" +"POT-Creation-Date: 2009-10-01 20:13+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1693,7 +1693,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:447 apt.conf.5.xml:469 msgid "options" msgstr "オプション" @@ -1943,7 +1943,7 @@ msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:968 apt_preferences.5.xml:615 +#: apt.conf.5.xml:979 apt_preferences.5.xml:615 msgid "Files" msgstr "ファイル" @@ -1957,7 +1957,7 @@ msgstr "" #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 #: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:985 apt_preferences.5.xml:622 #: sources.list.5.xml:221 msgid "See Also" msgstr "関連項目" @@ -3665,7 +3665,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:973 apt_preferences.5.xml:462 #: sources.list.5.xml:181 msgid "Examples" msgstr "サンプル" @@ -6064,30 +6064,41 @@ msgstr "" msgid "Immediate-Configure" msgstr "Immediate-Configure" -# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:154 msgid "" -"Disable Immediate Configuration; This dangerous option disables some of " -"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " -"necessary on some extremely slow single user systems but is very dangerous " -"and may cause package install scripts to fail or worse. Use at your own " -"risk." -msgstr "" -"即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg の呼" -"び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシステム" -"では必要かもしれませんが、非常に危険で、パッケージのインストールスクリプトが" -"失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任で使用して" -"ください。" - -#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:161 +"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 " +"doesn't treat an important package in the same way as an extra package: " +"Between the unpacking of the important package A and his configuration can " +"then be many other unpack or configuration calls, e.g. for package B which " +"has no relation to A, but causes the dpkg call to fail (e.g. because " +"maintainer script of package B generates an error) which results in a system " +"state in which package A is unpacked but unconfigured - each package " +"depending on A is now no longer guaranteed to work as their dependency on A " +"is not longer satisfied. The immediate configuration marker is also applied " +"to all dependencies which can generate a problem if the dependencies e.g. " +"form a circle as a dependency with the immediate flag is comparable with a " +"Pre-Dependency. So in theory it is possible that APT encounters a situation " +"in which it is unable to perform immediate configuration, error out and " +"refers to this option so the user can deactivate the immediate configuration " +"temporary to be able to perform an install/upgrade again. Note the use of " +"the word \"theory\" here as this problem was only encountered by now in real " +"world a few times in non-stable distribution versions and caused by wrong " +"dependencies of the package in question, so you should not blindly disable " +"this option as the mentioned scenario above is not the only problem " +"immediate configuration can help to prevent in the first place." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:172 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:162 +#: apt.conf.5.xml:173 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/" @@ -6105,13 +6116,13 @@ msgstr "" "不可欠パッケージで動作します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:170 +#: apt.conf.5.xml:181 msgid "Cache-Limit" msgstr "Cache-Limit" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:171 +#: apt.conf.5.xml:182 msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." @@ -6120,24 +6131,24 @@ msgstr "" "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:175 +#: apt.conf.5.xml:186 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:176 +#: apt.conf.5.xml:187 msgid "Defines which package(s) are considered essential build dependencies." msgstr "構築依存関係で不可欠なパッケージを定義します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:179 +#: apt.conf.5.xml:190 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:180 +#: apt.conf.5.xml:191 msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." @@ -6146,13 +6157,13 @@ msgstr "" "&apt-get; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:184 +#: apt.conf.5.xml:195 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:185 +#: apt.conf.5.xml:196 msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." @@ -6161,13 +6172,13 @@ msgstr "" "は &apt-cache; の文書を参照してください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:189 +#: apt.conf.5.xml:200 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:190 +#: apt.conf.5.xml:201 msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." @@ -6177,17 +6188,17 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:196 +#: apt.conf.5.xml:207 msgid "The Acquire Group" msgstr "Acquire グループ" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:201 +#: apt.conf.5.xml:212 msgid "PDiffs" msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:202 +#: apt.conf.5.xml:213 msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." @@ -6197,13 +6208,13 @@ msgstr "" "ルトでは True です。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:207 +#: apt.conf.5.xml:218 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:208 +#: apt.conf.5.xml:219 msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -6218,13 +6229,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:215 +#: apt.conf.5.xml:226 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:216 +#: apt.conf.5.xml:227 msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." @@ -6233,13 +6244,13 @@ msgstr "" "えられた回数だけリトライを行います。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:220 +#: apt.conf.5.xml:231 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:221 +#: apt.conf.5.xml:232 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." @@ -6250,13 +6261,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:225 sources.list.5.xml:139 +#: apt.conf.5.xml:236 sources.list.5.xml:139 msgid "http" msgstr "http" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:226 +#: apt.conf.5.xml:237 #, fuzzy #| msgid "" #| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " @@ -6282,7 +6293,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:234 +#: apt.conf.5.xml:245 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 " @@ -6307,7 +6318,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:244 apt.conf.5.xml:301 +#: apt.conf.5.xml:255 apt.conf.5.xml:312 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -6319,7 +6330,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:247 +#: apt.conf.5.xml:258 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) " @@ -6338,7 +6349,7 @@ msgstr "" "ます。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:255 +#: apt.conf.5.xml:266 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 " @@ -6349,12 +6360,12 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:261 +#: apt.conf.5.xml:272 msgid "https" msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:262 +#: apt.conf.5.xml:273 msgid "" "HTTPS URIs. Cache-control and proxy options are the same as for " "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " @@ -6365,7 +6376,7 @@ msgstr "" "していません。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:266 +#: apt.conf.5.xml:277 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -6387,13 +6398,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:284 sources.list.5.xml:150 +#: apt.conf.5.xml:295 sources.list.5.xml:150 msgid "ftp" msgstr "ftp" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:285 +#: apt.conf.5.xml:296 #, fuzzy #| msgid "" #| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the " @@ -6436,7 +6447,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:304 +#: apt.conf.5.xml:315 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 " @@ -6452,7 +6463,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:311 +#: apt.conf.5.xml:322 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 " @@ -6466,7 +6477,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:316 +#: apt.conf.5.xml:327 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6483,19 +6494,19 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:323 sources.list.5.xml:132 +#: apt.conf.5.xml:334 sources.list.5.xml:132 msgid "cdrom" msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:329 +#: apt.conf.5.xml:340 #, 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:324 +#: apt.conf.5.xml:335 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 " @@ -6516,13 +6527,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:334 +#: apt.conf.5.xml:345 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:335 +#: apt.conf.5.xml:346 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -6533,18 +6544,18 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:340 +#: apt.conf.5.xml:351 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:346 +#: apt.conf.5.xml:357 #, 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:341 +#: apt.conf.5.xml:352 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -6556,19 +6567,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:351 +#: apt.conf.5.xml:362 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:365 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:347 +#: apt.conf.5.xml:358 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 " @@ -6585,13 +6596,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:358 +#: apt.conf.5.xml:369 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:356 +#: apt.conf.5.xml:367 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -6606,7 +6617,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:363 +#: apt.conf.5.xml:374 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -6617,7 +6628,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:197 +#: apt.conf.5.xml:208 msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" @@ -6628,13 +6639,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:372 +#: apt.conf.5.xml:383 msgid "Directories" msgstr "ディレクトリ" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:385 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6654,7 +6665,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:381 +#: apt.conf.5.xml:392 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6676,7 +6687,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:390 +#: apt.conf.5.xml:401 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6691,7 +6702,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:396 +#: apt.conf.5.xml:407 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 " @@ -6703,7 +6714,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:400 +#: apt.conf.5.xml:411 #, fuzzy #| msgid "" #| "Binary programs are pointed to by <literal>Dir::Bin</literal>. " @@ -6728,7 +6739,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:408 +#: apt.conf.5.xml:419 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6749,13 +6760,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:421 +#: apt.conf.5.xml:432 msgid "APT in DSelect" msgstr "DSelect での APT" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:423 +#: apt.conf.5.xml:434 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -6765,13 +6776,13 @@ msgstr "" "設定項目で、デフォルトの動作を制御します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:427 +#: apt.conf.5.xml:438 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:428 +#: apt.conf.5.xml:439 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 " @@ -6788,7 +6799,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:437 +#: apt.conf.5.xml:448 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." @@ -6798,13 +6809,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:452 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:442 +#: apt.conf.5.xml:453 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." @@ -6813,13 +6824,13 @@ msgstr "" "されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:446 +#: apt.conf.5.xml:457 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:447 +#: apt.conf.5.xml:458 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." @@ -6829,13 +6840,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:453 +#: apt.conf.5.xml:464 msgid "How APT calls dpkg" msgstr "APT が dpkg を呼ぶ方法" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:454 +#: apt.conf.5.xml:465 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." @@ -6845,7 +6856,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:459 +#: apt.conf.5.xml:470 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 " @@ -6855,18 +6866,18 @@ msgstr "" "ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:475 msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:464 +#: apt.conf.5.xml:475 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:465 +#: apt.conf.5.xml:476 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 " @@ -6880,13 +6891,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:471 +#: apt.conf.5.xml:482 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:472 +#: apt.conf.5.xml:483 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 " @@ -6902,7 +6913,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:478 +#: apt.conf.5.xml:489 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6918,13 +6929,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:496 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:486 +#: apt.conf.5.xml:497 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." @@ -6934,13 +6945,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:490 +#: apt.conf.5.xml:501 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:491 +#: apt.conf.5.xml:502 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." @@ -6949,12 +6960,12 @@ msgstr "" "ます。デフォルトでは署名を無効にし、全バイナリを生成します。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:496 +#: apt.conf.5.xml:507 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:497 +#: apt.conf.5.xml:508 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -6969,7 +6980,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:512 +#: apt.conf.5.xml:523 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6979,7 +6990,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:517 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 " @@ -6993,12 +7004,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:518 +#: apt.conf.5.xml:529 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:519 +#: apt.conf.5.xml:530 msgid "" "Add the no triggers flag to all dpkg calls (expect the ConfigurePending " "call). See &dpkg; if you are interested in what this actually means. In " @@ -7011,14 +7022,14 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:537 #, fuzzy #| msgid "Packages::Compress" msgid "PackageManager::Configure" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:527 +#: apt.conf.5.xml:538 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -7035,13 +7046,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:537 +#: apt.conf.5.xml:548 #, fuzzy msgid "DPkg::ConfigurePending" msgstr "ユーザの設定" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:549 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -7052,12 +7063,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:544 +#: apt.conf.5.xml:555 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:545 +#: apt.conf.5.xml:556 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -7067,12 +7078,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:550 +#: apt.conf.5.xml:561 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:551 +#: apt.conf.5.xml:562 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-" @@ -7084,12 +7095,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:569 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:566 +#: apt.conf.5.xml:577 #, no-wrap msgid "" "OrderList::Score {\n" @@ -7101,7 +7112,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:559 +#: apt.conf.5.xml:570 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 " @@ -7115,12 +7126,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:590 msgid "Periodic and Archives options" msgstr "Periodic オプションと Archives オプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:580 +#: apt.conf.5.xml:591 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -7134,12 +7145,12 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:588 +#: apt.conf.5.xml:599 msgid "Debug options" msgstr "デバッグオプション" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:590 +#: apt.conf.5.xml:601 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -7150,7 +7161,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:601 +#: apt.conf.5.xml:612 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -7161,7 +7172,7 @@ msgstr "" "にします。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:609 +#: apt.conf.5.xml:620 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -7172,7 +7183,7 @@ msgstr "" "literal>) を行う場合に使用します。" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:618 +#: apt.conf.5.xml:629 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -7182,66 +7193,66 @@ msgstr "" #. motivating example, except I haven't a clue why you'd want #. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:626 +#: apt.conf.5.xml:637 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:636 +#: apt.conf.5.xml:647 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:641 +#: apt.conf.5.xml:652 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:645 +#: apt.conf.5.xml:656 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:652 +#: apt.conf.5.xml:663 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:656 +#: apt.conf.5.xml:667 msgid "Print information related to downloading packages using FTP." msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:663 +#: apt.conf.5.xml:674 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:667 +#: apt.conf.5.xml:678 msgid "Print information related to downloading packages using HTTP." msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:674 +#: apt.conf.5.xml:685 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:678 +#: apt.conf.5.xml:689 msgid "Print information related to downloading packages using HTTPS." msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:685 +#: apt.conf.5.xml:696 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:689 +#: apt.conf.5.xml:700 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." @@ -7249,46 +7260,46 @@ msgstr "" "<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:696 +#: apt.conf.5.xml:707 msgid "<literal>Debug::aptcdrom</literal>" msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:700 +#: apt.conf.5.xml:711 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:707 +#: apt.conf.5.xml:718 msgid "<literal>Debug::BuildDeps</literal>" msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:710 +#: apt.conf.5.xml:721 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:717 +#: apt.conf.5.xml:728 msgid "<literal>Debug::Hashes</literal>" msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:731 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:727 +#: apt.conf.5.xml:738 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:741 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 " @@ -7296,93 +7307,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:738 +#: apt.conf.5.xml:749 msgid "<literal>Debug::NoLocking</literal>" msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:741 +#: apt.conf.5.xml:752 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:749 +#: apt.conf.5.xml:760 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:753 +#: apt.conf.5.xml:764 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:760 +#: apt.conf.5.xml:771 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:763 +#: apt.conf.5.xml:774 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:770 +#: apt.conf.5.xml:781 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:773 +#: apt.conf.5.xml:784 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:781 +#: apt.conf.5.xml:792 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:785 +#: apt.conf.5.xml:796 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:792 +#: apt.conf.5.xml:803 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:796 +#: apt.conf.5.xml:807 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:803 +#: apt.conf.5.xml:814 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:807 +#: apt.conf.5.xml:818 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:814 +#: apt.conf.5.xml:825 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:817 +#: apt.conf.5.xml:828 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -7392,12 +7403,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:828 +#: apt.conf.5.xml:839 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:831 +#: apt.conf.5.xml:842 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -7414,91 +7425,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:850 +#: apt.conf.5.xml:861 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:853 +#: apt.conf.5.xml:864 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:860 +#: apt.conf.5.xml:871 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:863 +#: apt.conf.5.xml:874 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:871 +#: apt.conf.5.xml:882 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:874 +#: apt.conf.5.xml:885 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:881 +#: apt.conf.5.xml:892 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:885 +#: apt.conf.5.xml:896 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:893 +#: apt.conf.5.xml:904 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:897 +#: apt.conf.5.xml:908 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:904 +#: apt.conf.5.xml:915 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:908 +#: apt.conf.5.xml:919 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:914 +#: apt.conf.5.xml:925 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:918 +#: apt.conf.5.xml:929 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:926 +#: apt.conf.5.xml:937 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:929 +#: apt.conf.5.xml:940 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 " @@ -7506,12 +7517,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:937 +#: apt.conf.5.xml:948 msgid "<literal>Debug::sourceList</literal>" msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:941 +#: apt.conf.5.xml:952 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." @@ -7519,7 +7530,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:963 +#: apt.conf.5.xml:974 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." @@ -7529,7 +7540,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:970 +#: apt.conf.5.xml:981 #, fuzzy #| msgid "&apt-conf;" msgid "&file-aptconf;" @@ -7538,7 +7549,7 @@ msgstr "&apt-conf;" # type: Content of: <refentry><refsect1><para> #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:975 +#: apt.conf.5.xml:986 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." @@ -10424,6 +10435,20 @@ msgstr "" msgid "Which will use the already fetched archives on the disc." msgstr "" +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#~ msgid "" +#~ "Disable Immediate Configuration; This dangerous option disables some of " +#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " +#~ "necessary on some extremely slow single user systems but is very " +#~ "dangerous and may cause package install scripts to fail or worse. Use at " +#~ "your own risk." +#~ msgstr "" +#~ "即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg " +#~ "の呼び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシ" +#~ "ステムでは必要かもしれませんが、非常に危険で、パッケージのインストールスク" +#~ "リプトが失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任" +#~ "で使用してください。" + # type: Content of: <refentry><refnamediv><refname> #, fuzzy #~ msgid "NoConfigure" diff --git a/po/apt-all.pot b/po/apt-all.pot index a30ce26a7..f894f121e 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-09-30 18:47+0200\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" @@ -2305,6 +2305,20 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +#: apt-pkg/packagemanager.cc:474 +#, c-format +msgid "" +"Could not perform immediate configuration for on already unpacked %s.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + +#: apt-pkg/packagemanager.cc:575 +#, c-format +msgid "" +"Could not perform immediate configuration on %s.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" -- cgit v1.2.3-70-g09d2 From f465a80f6e0e0cc3edae1870881135ced824c9e3 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Mon, 12 Oct 2009 16:24:34 +0200 Subject: methods/https.cc: Add support for authentication using netrc (Closes: #518473), patch by Jussi Hakala <jussi.hakala@hut.fi>. --- debian/changelog | 3 +++ methods/https.cc | 1 + 2 files changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 34a35b2f9..68ee83bac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ apt (0.7.25) UNRELEASED; urgency=low - Restrict option names to alphanumerical characters and "/-:._+". - Deprecate #include, we have apt.conf.d nowadays which should be sufficient. + * methods/https.cc: + - Add support for authentication using netrc (Closes: #518473), patch + by Jussi Hakala <jussi.hakala@hut.fi>. -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200 diff --git a/methods/https.cc b/methods/https.cc index 37d93e308..79e6fea3f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -135,6 +135,7 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); + curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); // SSL parameters are set by default to the common (non mirror-specific) value // if available (or a default one) and gets overload by mirror-specific ones. -- cgit v1.2.3-70-g09d2 From 71bba383561308577a6ae1acea136428721a5f36 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 13 Oct 2009 20:07:59 +0200 Subject: add a note about the possibility to support more URI types by installing some apt-transport-methods packages, e.g. https and debtorrent. --- debian/changelog | 2 ++ doc/sources.list.5.xml | 12 ++++++++++++ 2 files changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 17a770b73..fc5965d3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure + * doc/sources.list.5.xml: + - add note about additional apt-transport-methods -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200 diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index c758be61f..379112c83 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -174,6 +174,18 @@ deb http://http.us.debian.org/debian dists/stable-updates/ <command>dd</command> commands to perform the file transfers from the remote.</para></listitem> </varlistentry> + + <varlistentry><term>more recongnizable URI types</term> + <listitem><para> + APT can be extended with more methods shipped in other optional packages which should + follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>. + The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which + provides access methods for https-URIs with features similiar to the http method, but other + methods for using e.g. debtorrent are also available, see <citerefentry> + <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> + <manvolnum>1</manvolnum></citerefentry>. + </para></listitem> + </varlistentry> </variablelist> </para> </refsect1> -- cgit v1.2.3-70-g09d2 From 5632b305b24161e18a809b4bb33a19ec8ea3d497 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sun, 18 Oct 2009 10:43:25 +0200 Subject: correct apt-mark showauto synopsis, thanks Andrew Schulman (Closes: #551440) --- debian/changelog | 2 ++ doc/apt-mark.8.xml | 2 +- doc/po/apt-doc.pot | 6 +++--- doc/po/fr.po | 6 +++--- doc/po/ja.po | 6 +++--- 5 files changed, 12 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 313ae2865..4b2719e50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ apt (0.7.25) UNRELEASED; urgency=low - provide a few more details about APT::Immediate-Configure * doc/sources.list.5.xml: - add note about additional apt-transport-methods + * doc/apt-mark.8.xml: + - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440) [ Julian Andres Klode ] * doc/apt.conf.5.xml: diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 35412d7c9..3f6cc78f5 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -80,7 +80,7 @@ <varlistentry><term>showauto</term> <listitem><para><literal>showauto</literal> is used to print a - list of manually installed packages with each package on a new line. + list of automatically installed packages with each package on a new line. </para></listitem> </varlistentry> </variablelist> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 00818eb27..20f563c46 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-10-14 07:44+0300\n" +"POT-Creation-Date: 2009-10-18 10:39+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" @@ -3812,8 +3812,8 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 msgid "" -"<literal>showauto</literal> is used to print a list of manually installed " -"packages with each package on a new line." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> diff --git a/doc/po/fr.po b/doc/po/fr.po index 89cd1df34..b0fe59e86 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-10-14 07:44+0300\n" +"POT-Creation-Date: 2009-10-18 10:39+0300\n" "PO-Revision-Date: 2009-09-26 19:25+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -5036,8 +5036,8 @@ msgstr "" #| "automatically installed to satisfy dependencies for some package and that " #| "are no more needed." msgid "" -"<literal>showauto</literal> is used to print a list of manually installed " -"packages with each package on a new line." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." msgstr "" "Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets " "installés dans le but de satisfaire les dépendances d'un paquet donné et qui " diff --git a/doc/po/ja.po b/doc/po/ja.po index c4e004415..c51567453 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2009-10-14 07:44+0300\n" +"POT-Creation-Date: 2009-10-18 10:39+0300\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -5222,8 +5222,8 @@ msgstr "" #| "automatically installed to satisfy dependencies for some package and that " #| "are no more needed." msgid "" -"<literal>showauto</literal> is used to print a list of manually installed " -"packages with each package on a new line." +"<literal>showauto</literal> is used to print a list of automatically " +"installed packages with each package on a new line." msgstr "" "<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール" "され、もう必要なくなったパッケージを削除するのに使用します。" -- cgit v1.2.3-70-g09d2 From 9c876fe428588d155533b40f95265beaee03fc88 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 19 Oct 2009 21:10:09 +0200 Subject: rewrite FindSrc() in cmdline/apt-get.cc to fix some bugs, including: * cmdline/apt-get.cc: - source should displays his final pkg pick (Closes: #249383, #550952) - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) --- cmdline/apt-get.cc | 256 ++++++++++++++++++++++++++--------------------------- debian/changelog | 4 + po/apt-all.pot | 131 ++++++++++++++------------- 3 files changed, 200 insertions(+), 191 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c32d67226..ca14f4c2b 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1243,137 +1243,131 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, pkgSrcRecords &SrcRecs,string &Src, pkgDepCache &Cache) { - // We want to pull the version off the package specification.. - string VerTag; - string DefRel; - string TmpSrc = Name; - const size_t found = TmpSrc.find_last_of("/="); - - // honor default release - if (found != string::npos && TmpSrc[found] == '/') - { - DefRel = TmpSrc.substr(found+1); - TmpSrc = TmpSrc.substr(0,found); - } - else - DefRel = _config->Find("APT::Default-Release"); - - pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); - - if (found != string::npos && TmpSrc[found] == '=') - { - VerTag = TmpSrc.substr(found+1); - TmpSrc = TmpSrc.substr(0,found); - } - else if(!Pkg.end() && DefRel.empty() == false) - { - // we have a default release, try to locate the pkg. we do it like - // this because GetCandidateVer() will not "downgrade", that means - // "apt-get source -t stable apt" won't work on a unstable system - for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; - Ver++) - { - for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false; - VF++) - { - /* If this is the status file, and the current version is not the - version in the status file (ie it is not installed, or somesuch) - then it is not a candidate for installation, ever. This weeds - out bogus entries that may be due to config-file states, or - other. */ - if ((VF.File()->Flags & pkgCache::Flag::NotSource) == - pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) - continue; - - if((VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || - (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) - { - pkgRecords::Parser &Parse = Recs.Lookup(VF); - VerTag = Parse.SourceVer(); - if (VerTag.empty()) - VerTag = Ver.VerStr(); - break; - } - } - } - } - - /* Lookup the version of the package we would install if we were to - install a version and determine the source package name, then look - in the archive for a source package of the same name. */ - bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); - if (MatchSrcOnly == false) - { - if (Pkg.end() == false) - { - pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); - if (Ver.end() == false) - { - pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); - Src = Parse.SourcePkg(); - } - } - } - - // The best hit - pkgSrcRecords::Parser *Last = 0; - unsigned long Offset = 0; - string Version; - bool IsMatch = false; - - // No source package name.. - if (Src.empty() == true) - Src = TmpSrc; - else - // if we have a source pkg name, make sure to only search - // for srcpkg names, otherwise apt gets confused if there - // is a binary package "pkg1" and a source package "pkg1" - // with the same name but that comes from different packages - MatchSrcOnly = true; - - // If we are matching by version then we need exact matches to be happy - if (VerTag.empty() == false) - IsMatch = true; - - /* Iterate over all of the hits, which includes the resulting - binary packages in the search */ - pkgSrcRecords::Parser *Parse; - SrcRecs.Restart(); - while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) - { - string Ver = Parse->Version(); - - // show name mismatches - if (IsMatch == true && Parse->Package() != Src) - ioprintf(c1out, _("No source package '%s' picking '%s' instead\n"), Src.c_str(), Parse->Package().c_str()); - - if (VerTag.empty() == false) - { - /* Don't want to fall through because we are doing exact version - matching. */ - if (Cache.VS().CmpVersion(VerTag,Ver) != 0) - continue; - - Last = Parse; - Offset = Parse->Offset(); - break; - } - - // Newer version or an exact match - if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0 || - (Parse->Package() == Src && IsMatch == false)) - { - IsMatch = Parse->Package() == Src; - Last = Parse; - Offset = Parse->Offset(); - Version = Ver; - } - } - - if (Last == 0 || Last->Jump(Offset) == false) - return 0; - - return Last; + string VerTag; + string DefRel = _config->Find("APT::Default-Release"); + string TmpSrc = Name; + const size_t found = TmpSrc.find_last_of("/="); + + // extract the version/release from the pkgname + if (found != string::npos) { + if (TmpSrc[found] == '/') + DefRel = TmpSrc.substr(found+1); + else + VerTag = TmpSrc.substr(found+1); + TmpSrc = TmpSrc.substr(0,found); + } + + /* Lookup the version of the package we would install if we were to + install a version and determine the source package name, then look + in the archive for a source package of the same name. */ + bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source"); + const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc); + if (MatchSrcOnly == false && Pkg.end() == false) { + if(VerTag.empty() == false || DefRel.empty() == false) { + // we have a default release, try to locate the pkg. we do it like + // this because GetCandidateVer() will not "downgrade", that means + // "apt-get source -t stable apt" won't work on a unstable system + for (pkgCache::VerIterator Ver = Pkg.VersionList(); + Ver.end() == false; Ver++) { + for (pkgCache::VerFileIterator VF = Ver.FileList(); + VF.end() == false; VF++) { + /* If this is the status file, and the current version is not the + version in the status file (ie it is not installed, or somesuch) + then it is not a candidate for installation, ever. This weeds + out bogus entries that may be due to config-file states, or + other. */ + if ((VF.File()->Flags & pkgCache::Flag::NotSource) == + pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver) + continue; + + // We match against a concrete version (or a part of this version) + if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0) + continue; + + // or we match against a release + if(VerTag.empty() == false || + (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) || + (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) { + pkgRecords::Parser &Parse = Recs.Lookup(VF); + Src = Parse.SourcePkg(); + if (VerTag.empty() == true) + VerTag = Parse.SourceVer(); + break; + } + } + } + if (Src.empty() == true) { + if (VerTag.empty() == false) + _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); + else + _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str()); + VerTag.clear(); + DefRel.clear(); + } + } + if (VerTag.empty() == true && DefRel.empty() == true) { + // if we don't have a version or default release, use the CandidateVer to find the Source + pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); + if (Ver.end() == false) { + pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); + Src = Parse.SourcePkg(); + VerTag = Parse.SourceVer(); + } + } + } + + if (Src.empty() == true) + Src = TmpSrc; + else { + /* if we have a source pkg name, make sure to only search + for srcpkg names, otherwise apt gets confused if there + is a binary package "pkg1" and a source package "pkg1" + with the same name but that comes from different packages */ + MatchSrcOnly = true; + if (Src != TmpSrc) { + ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str()); + } + } + + // The best hit + pkgSrcRecords::Parser *Last = 0; + unsigned long Offset = 0; + string Version; + + /* Iterate over all of the hits, which includes the resulting + binary packages in the search */ + pkgSrcRecords::Parser *Parse; + while (true) { + SrcRecs.Restart(); + while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) { + const string Ver = Parse->Version(); + + // Ignore all versions which doesn't fit + if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0) + continue; + + // Newer version or an exact match? Save the hit + if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) { + Last = Parse; + Offset = Parse->Offset(); + Version = Ver; + } + + // was the version check above an exact match? If so, we don't need to look further + if (VerTag.empty() == false && VerTag.size() == Ver.size()) + break; + } + if (Last != 0 || VerTag.empty() == true) + break; + //if (VerTag.empty() == false && Last == 0) + _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); + VerTag.clear(); + } + + if (Last == 0 || Last->Jump(Offset) == false) + return 0; + + return Last; } /*}}}*/ // DoUpdate - Update the package lists /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 4b2719e50..82b08619d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,10 @@ apt (0.7.25) UNRELEASED; urgency=low - add note about additional apt-transport-methods * doc/apt-mark.8.xml: - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440) + * cmdline/apt-get.cc: + - source should displays his final pkg pick (Closes: #249383, #550952) + - source doesn't need the complete version for match (Closes: #245250) + - source ignores versions/releases if not available (Closes: #377424) [ Julian Andres Klode ] * doc/apt.conf.5.xml: diff --git a/po/apt-all.pot b/po/apt-all.pot index f894f121e..f464ef198 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 18:47+0200\n" +"POT-Creation-Date: 2009-10-19 21:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,7 +151,7 @@ msgstr "" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2645 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1714 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2056 cmdline/apt-get.cc:2089 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2137 cmdline/apt-get.cc:2386 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2232 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -775,7 +775,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2283 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -784,7 +784,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2292 msgid "Download complete and in download only mode" msgstr "" @@ -876,39 +876,50 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1301 cmdline/apt-get.cc:1363 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1303 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1328 +#, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:1379 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1392 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1448 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1497 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1499 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1500 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1505 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -924,49 +935,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1508 cmdline/apt-get.cc:1798 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1512 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1531 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1586 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1701 cmdline/apt-get.cc:1737 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1724 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1755 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1768 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1771 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1783 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -974,152 +985,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1801 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1830 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1919 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1920 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1949 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1952 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1957 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2024 cmdline/apt-get.cc:2032 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2132 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2162 cmdline/apt-get.cc:2404 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2211 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2242 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2248 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2251 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2257 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2288 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2316 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2328 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2329 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2365 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2381 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2409 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2429 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2481 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2534 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2570 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2597 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2613 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2618 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2650 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2691 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1163,7 +1174,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2858 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" -- cgit v1.2.3-70-g09d2 From 65dd3fce8a1ac0461c385f879f1a053b4e3bfb91 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Mon, 19 Oct 2009 23:07:18 +0200 Subject: German translation update --- debian/changelog | 2 + po/de.po | 496 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 261 insertions(+), 237 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 68ee83bac..57f0ddccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #479997 * Polish translation update by Wiktor Wandachowicz Closes: #548571 + * German translation update by Holger Wansing + Closes: #551534 [ Michael Vogt ] * apt-pkg/packagemanager.cc: diff --git a/po/de.po b/po/de.po index f1a2cb8dc..460e26ec4 100644 --- a/po/de.po +++ b/po/de.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-27 17:32+0200\n" -"PO-Revision-Date: 2009-07-12 01:12+0200\n" +"PO-Revision-Date: 2009-08-11 20:59+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "Paket %s Version %s hat eine nicht erfüllte Abhängigkeit:\n" #: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575 #, c-format msgid "Unable to locate package %s" -msgstr "Kann Paket %s nicht finden" +msgstr "Paket %s kann nicht gefunden werden" #: cmdline/apt-cache.cc:245 msgid "Total package names: " @@ -85,7 +85,7 @@ msgstr "Gesamtzahl an Mustern: " #: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " -msgstr "Gesamtmenge an Abhängigkeits/Versionsspeicher: " +msgstr "Gesamtmenge an Abhängigkeits-/Versionsspeicher: " #: cmdline/apt-cache.cc:333 msgid "Total slack space: " @@ -114,7 +114,7 @@ msgstr "Paketdateien:" #: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cache ist nicht sychron, kann eine Paketdatei nicht querverweisen" +msgstr "Cache ist nicht sychron, Querverweisen einer Paketdatei nicht möglich" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1549 @@ -204,7 +204,7 @@ msgstr "" " apt-cache [Optionen] showsrc paket1 [paket2 ...]\n" "\n" "apt-cache ist ein Low-Level-Werkzeug, um die binären Cache-Dateien von\n" -"APT zu manipulieren und Informationen daraus zu erfragen.\n" +"APT zu bearbeiten und Informationen daraus zu erfragen.\n" "\n" "Befehle:\n" " add – Paket-Datei dem Quell-Cache hinzufügen\n" @@ -238,13 +238,14 @@ msgstr "" #, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 2.1r1 " +"Bitte geben Sie einen Namen für die CD an, wie zum Beispiel »Debian 5.0.0r1 " "Disk 1«" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "" -"Bitte legen Sie ein Medium ins Laufwerk und drücken Sie die Eingabetaste" +"Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " +"Eingabetaste" #: cmdline/apt-cdrom.cc:114 msgid "Repeat this process for the rest of the CDs in your set." @@ -318,11 +319,12 @@ msgstr "" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 #, c-format msgid "Unable to write to %s" -msgstr "Kann nicht nach %s schreiben" +msgstr "Schreiben nach %s nicht möglich" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kann debconf-Version nicht ermitteln. Ist debconf installiert?" +msgstr "" +"debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -437,7 +439,7 @@ msgstr "" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Keine Auswahl passt" +msgstr "Keine Auswahl passend" #: ftparchive/apt-ftparchive.cc:832 #, c-format @@ -447,31 +449,32 @@ msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«" #: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "DB wurde beschädigt, Datei umbenannt in %s.old" +msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB ist alt, versuche %s zu erneuern" +msgstr "Datenbank ist veraltet, versuche %s zu erneuern" #: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -"DB-Format ist ungültig. Wenn Sie ein Update von einer älteren Version von " -"apt gemacht haben, entfernen Sie bitte die Datenbank und erstellen sie neu." +"Datenbank-Format ist ungültig. Wenn Sie ein Update basierend auf einer " +"älteren Version von apt gemacht haben, entfernen Sie bitte die Datenbank und " +"erstellen Sie sie neu." #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Kann DB-Datei %s nicht öffnen: %s" +msgstr "Datenbank-Datei %s kann nicht geöffnet werden: %s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" -msgstr "Konnte kein »stat« auf %s durchführen." +msgstr "Ausführen von »stat« auf %s fehlgeschlagen." #: ftparchive/cachedb.cc:238 msgid "Archive has no control record" @@ -479,17 +482,17 @@ msgstr "Archiv hat keinen Steuerungs-Datensatz" #: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "Kann keinen Cursor bekommen" +msgstr "Bekommen eines Cursors nicht möglich" #: ftparchive/writer.cc:76 #, c-format msgid "W: Unable to read directory %s\n" -msgstr "W: Kann Verzeichnis %s nicht lesen\n" +msgstr "W: Verzeichnis %s kann nicht gelesen werden\n" #: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "W: Kann kein »stat« auf %s durchführen\n" +msgstr "W: Ausführen von »stat« auf %s nicht möglich\n" #: ftparchive/writer.cc:132 msgid "E: " @@ -506,7 +509,7 @@ msgstr "F: Fehler gehören zu Datei " #: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "Konnte %s nicht auflösen" +msgstr "%s konnte nicht aufgelöst werden" #: ftparchive/writer.cc:170 msgid "Tree walking failed" @@ -515,7 +518,7 @@ msgstr "Verzeichniswechsel im Verzeichnisbaum fehlgeschlagen" #: ftparchive/writer.cc:195 #, c-format msgid "Failed to open %s" -msgstr "Konnte %s nicht öffnen" +msgstr "Öffnen von %s fehlgeschlagen" #: ftparchive/writer.cc:254 #, c-format @@ -525,17 +528,17 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "Kann kein readlink auf %s durchführen" +msgstr "readlink auf %s fehlgeschlagen" #: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "Konnte %s nicht entfernen (unlink)" +msgstr "Entfernen (unlink) von %s fehlgeschlagen" #: ftparchive/writer.cc:273 #, c-format msgid "*** Failed to link %s to %s" -msgstr "*** Konnte keine Verknüpfung von %s zu %s anlegen" +msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" #: ftparchive/writer.cc:283 #, c-format @@ -569,7 +572,7 @@ msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" #: ftparchive/contents.cc:321 #, c-format msgid "Internal error, could not locate member %s" -msgstr "Interner Fehler, konnte Bestandteil %s nicht finden" +msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" @@ -578,7 +581,7 @@ msgstr "realloc – Speicheranforderung fehlgeschlagen" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" -msgstr "Kann %s nicht öffnen" +msgstr "%s konnte nicht geöffnet werden" #: ftparchive/override.cc:60 ftparchive/override.cc:166 #, c-format @@ -598,7 +601,7 @@ msgstr "Missgestaltetes Override %s Zeile %lu #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Konnte die Override-Datei %s nicht lesen." +msgstr "Override-Datei %s konnte nicht gelesen werden." #: ftparchive/multicompress.cc:72 #, c-format @@ -608,15 +611,16 @@ msgstr "Unbekannter Komprimierungsalgorithmus »%s«" #: ftparchive/multicompress.cc:102 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "Komprimierte Ausgabe %s braucht einen Komprimierungs-Satz" +msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz" #: ftparchive/multicompress.cc:169 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" -msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht erzeugen" +msgstr "" +"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden" #: ftparchive/multicompress.cc:195 msgid "Failed to create FILE*" -msgstr "Konnte FILE* nicht erzeugen" +msgstr "FILE* konnte nicht erzeugt werden" #: ftparchive/multicompress.cc:198 msgid "Failed to fork" @@ -624,20 +628,21 @@ msgstr "Fork fehlgeschlagen" #: ftparchive/multicompress.cc:212 msgid "Compress child" -msgstr "Komprimierungskindprozess" +msgstr "Komprimierungs-Kindprozess" #: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "Interner Fehler, konnte %s nicht erzeugen" +msgstr "Interner Fehler, %s konnte nicht erzeugt werden" #: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "Konnte Interprozesskommunikation mit Unterprozess nicht herstellen" +msgstr "" +"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Konnte Komprimierer nicht ausführen" +msgstr "Komprimierer konnte nicht ausgeführt werden" #: ftparchive/multicompress.cc:360 msgid "decompressor" @@ -649,7 +654,7 @@ msgstr "E/A zu Kindprozess/Datei fehlgeschlagen" #: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "Konnte während der MD5-Berechnung nicht lesen" +msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" #: ftparchive/multicompress.cc:472 #, c-format @@ -659,7 +664,7 @@ msgstr "Problem beim Unlinking von %s" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format msgid "Failed to rename %s to %s" -msgstr "Konnte %s nicht in %s umbenennen" +msgstr "%s konnte nicht in %s umbenannt werden" #: cmdline/apt-get.cc:127 msgid "Y" @@ -672,7 +677,7 @@ msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" #: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" -msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:" +msgstr "Die folgenden Pakete haben nicht-erfüllte Abhängigkeiten:" #: cmdline/apt-get.cc:334 #, c-format @@ -722,7 +727,8 @@ msgstr "Die folgenden Pakete werden aktualisiert:" #: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" -msgstr "Die folgenden Pakete werden DEAKTUALISIERT:" +msgstr "" +"Die folgenden Pakete werden DEAKTUALISIERT (ältere Version wird installiert):" #: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" @@ -776,11 +782,11 @@ msgstr " fehlgeschlagen." #: cmdline/apt-get.cc:675 msgid "Unable to correct dependencies" -msgstr "Kann Abhängigkeiten nicht korrigieren" +msgstr "Abhängigkeiten konnten nicht korrigiert werden" #: cmdline/apt-get.cc:678 msgid "Unable to minimize the upgrade set" -msgstr "Kann die Menge zu aktualisierender Pakete nicht minimieren" +msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden" #: cmdline/apt-get.cc:680 msgid " Done" @@ -792,7 +798,7 @@ msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren." #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." -msgstr "Nicht erfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." +msgstr "Nicht-erfüllte Abhängigkeiten. Versuchen Sie, -f zu benutzen." #: cmdline/apt-get.cc:712 msgid "WARNING: The following packages cannot be authenticated!" @@ -828,7 +834,7 @@ msgstr "Interner Fehler, Anordnung beendete nicht" #: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 msgid "Unable to lock the download directory" -msgstr "Kann das Downloadverzeichnis nicht sperren." +msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." #: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 #: apt-pkg/cachefile.cc:65 @@ -838,8 +844,8 @@ msgstr "Die Liste der Quellen konnte nicht gelesen werden." #: cmdline/apt-get.cc:836 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie an " -"apt@packages.debian.org" +"Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " +"eine E-Mail an apt@packages.debian.org" #: cmdline/apt-get.cc:841 #, c-format @@ -864,7 +870,7 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" #: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 #, c-format msgid "Couldn't determine free space in %s" -msgstr "Konnte freien Platz in %s nicht bestimmen" +msgstr "Freier Platz in %s konnte nicht bestimmt werden" #: cmdline/apt-get.cc:876 #, c-format @@ -901,7 +907,7 @@ msgstr "Möchten Sie fortfahren [J/n]? " #: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" -msgstr "Konnte %s nicht holen %s\n" +msgstr "Fehlschlag beim Holen von %s %s\n" #: cmdline/apt-get.cc:1007 msgid "Some files failed to download" @@ -916,16 +922,16 @@ msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Konnte einige Archive nicht herunterladen; vielleicht »apt-get update« " -"ausführen oder mit »--fix-missing« probieren?" +"Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " +"update« ausführen oder mit »--fix-missing« probieren?" #: cmdline/apt-get.cc:1018 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing und Wechselmedien werden zurzeit nicht unterstützt" +msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt" #: cmdline/apt-get.cc:1023 msgid "Unable to correct missing packages." -msgstr "Konnte fehlende Pakete nicht korrigieren." +msgstr "Fehlende Pakete konnten nicht korrigiert werden." #: cmdline/apt-get.cc:1024 msgid "Aborting install." @@ -934,18 +940,19 @@ msgstr "Installation abgebrochen." #: cmdline/apt-get.cc:1082 #, c-format msgid "Note, selecting %s instead of %s\n" -msgstr "Hinweis: wähle %s an Stelle von %s\n" +msgstr "Hinweis: %s wird an Stelle von %s gewählt\n" #: cmdline/apt-get.cc:1093 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Überspringe %s, es ist schon installiert und »upgrade« ist nicht gesetzt.\n" +"%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht " +"gesetzt.\n" #: cmdline/apt-get.cc:1111 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt\n" +msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n" #: cmdline/apt-get.cc:1122 #, c-format @@ -967,8 +974,8 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"Paket %s ist nicht verfügbar, wird aber von einem anderen\n" -"Paket referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" +"Paket %s ist nicht verfügbar, wird aber von einem anderen Paket\n" +"referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" #: cmdline/apt-get.cc:1163 @@ -1018,11 +1025,12 @@ msgstr "Der Befehl »update« akzeptiert keine Argumente" #: cmdline/apt-get.cc:1398 msgid "Unable to lock the list directory" -msgstr "Kann das Listenverzeichnis nicht sperren" +msgstr "Das Listenverzeichnis kann nicht gesperrt werden" #: cmdline/apt-get.cc:1454 msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "Es soll nichts gelöscht werden, kann AutoRemover nicht starten" +msgstr "" +"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden" #: cmdline/apt-get.cc:1503 msgid "" @@ -1034,6 +1042,9 @@ msgstr "" #: cmdline/apt-get.cc:1505 #, fuzzy, c-format +#| msgid "" +#| "The following packages were automatically installed and are no longer " +#| "required:" msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Die folgenden Pakete wurden automatisch installiert und werden nicht länger " @@ -1078,17 +1089,17 @@ msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" #: cmdline/apt-get.cc:1592 #, c-format msgid "Couldn't find task %s" -msgstr "Konnte Task %s nicht finden" +msgstr "Task %s konnte nicht gefunden werden" #: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 #, c-format msgid "Couldn't find package %s" -msgstr "Konnte Paket %s nicht finden" +msgstr "Paket %s konnte nicht gefunden werden" #: cmdline/apt-get.cc:1730 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Hinweis: wähle %s für regulären Ausdruck »%s«\n" +msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n" #: cmdline/apt-get.cc:1761 #, c-format @@ -1160,7 +1171,7 @@ msgstr "" #: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 #, c-format msgid "Unable to find a source package for %s" -msgstr "Kann Quellpaket für %s nicht finden" +msgstr "Quellpaket für %s kann nicht gefunden werden" #: cmdline/apt-get.cc:2217 #, c-format @@ -1185,11 +1196,11 @@ msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:2263 #, c-format msgid "Fetch source %s\n" -msgstr "Hole Quelle %s\n" +msgstr "Quelle %s wird heruntergeladen\n" #: cmdline/apt-get.cc:2294 msgid "Failed to fetch some archives." -msgstr "Konnte einige Archive nicht holen." +msgstr "Einige Archive konnten nicht heruntergeladen werden." #: cmdline/apt-get.cc:2322 #, c-format @@ -1238,8 +1249,8 @@ msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht gefunden " -"werden kann." +"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " +"gefunden werden kann." #: cmdline/apt-get.cc:2540 #, c-format @@ -1247,20 +1258,20 @@ msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -"%s-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare " -"Version von Paket %s die Versionsanforderungen erfüllen kann." +"»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare " +"Version des Pakets %s die Versionsanforderungen erfüllen kann." #: cmdline/apt-get.cc:2576 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Konnte die %s-Abhängigkeit für %s nicht erfüllen: Installiertes Paket %s ist " -"zu neu." +"Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %" +"s ist zu neu." #: cmdline/apt-get.cc:2603 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Konnte die %s-Abhängigkeit für %s nicht erfüllen: %s" +msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" #: cmdline/apt-get.cc:2619 #, c-format @@ -1403,7 +1414,7 @@ msgstr "Es wurden %sB in %s geholt (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [Verarbeite]" +msgstr " [Wird verarbeitet]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1414,7 +1425,7 @@ msgid "" msgstr "" "Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" " »%s«\n" -"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n" +"in Laufwerk »%s« ein und drücken Sie die Eingabetaste.\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1462,19 +1473,19 @@ msgstr "Möchten Sie alle bisher heruntergeladenen .deb-Dateien löschen?" #, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" -"Einige Fehler traten während des Entpackens auf. Ich werde die installierten" +"Einige Fehler traten während des Entpackens auf. Die installierten Pakete" #: dselect/install:102 #, fuzzy msgid "will be configured. This may result in duplicate errors" msgstr "" -"Pakete konfigurieren. Dies kann zu doppelten Fehlermeldungen oder Fehlern " +"werden konfiguriert. Dies kann zu doppelten Fehlermeldungen oder Fehlern " "durch" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "" -"fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler über " +"fehlende Abhängigkeiten führen. Das ist in Ordnung, nur die Fehler oberhalb " "dieser" #: dselect/install:104 @@ -1489,11 +1500,11 @@ msgstr "Führe verfügbare Information zusammen" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" -msgstr "Konnte Pipes (Weiterleitungen) nicht erzeugen" +msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden" #: apt-inst/contrib/extracttar.cc:141 msgid "Failed to exec gzip " -msgstr "Konnte gzip nicht ausführen" +msgstr "gzip konnte nicht ausgeführt werden" #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" @@ -1518,6 +1529,7 @@ msgstr "Fehler beim Lesen der Archivdatei-Kopfzeilen" #: apt-inst/contrib/arfile.cc:90 #, fuzzy, c-format +#| msgid "Invalid archive member header" msgid "Invalid archive member header %s" msgstr "Ungültige Archivdatei-Kopfzeilen" @@ -1531,19 +1543,19 @@ msgstr "Archiv ist zu kurz" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "Konnte Archiv-Kopfzeilen nicht lesen" +msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "»DropNode« auf noch verknüpftem Knoten aufgerufen" +msgstr "»DropNode« auf noch verknüpften Knoten aufgerufen" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Konnte Hash-Element nicht finden!" +msgstr "Hash-Element konnte nicht gefunden werden!" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "Konnte Umleitung nicht reservieren" +msgstr "Umleitung konnte nicht reserviert werden" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1552,7 +1564,7 @@ msgstr "Interner Fehler in »AddDiversion«" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Versuche, Umleitung zu überschreiben: %s -> %s und %s/%s" +msgstr "Es wird versucht, eine Umleitung zu überschreiben: %s -> %s und %s/%s" #: apt-inst/filelist.cc:506 #, c-format @@ -1567,12 +1579,12 @@ msgstr "Doppelte Konfigurationsdatei %s/%s" #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 #, c-format msgid "Failed to write file %s" -msgstr "Konnte Datei %s nicht schreiben" +msgstr "Datei %s konnte nicht geschrieben werden" #: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 #, c-format msgid "Failed to close file %s" -msgstr "Konnte Datei %s nicht schließen" +msgstr "Datei %s konnte nicht geschlossen werden" #: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format @@ -1582,7 +1594,7 @@ msgstr "Der Pfad %s ist zu lang" #: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "Packe %s mehr als einmal aus" +msgstr "%s mehr als einmal ausgepackt" #: apt-inst/extract.cc:134 #, c-format @@ -1592,7 +1604,7 @@ msgstr "Das Verzeichnis %s ist umgeleitet" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Das Paket versucht, auf das Umleitungsziel %s/%s zu schreiben" +msgstr "Vom Paket wird versucht, auf das Umleitungsziel %s/%s zu schreiben" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" @@ -1605,7 +1617,7 @@ msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "Konnte Knoten nicht in seinem Hash finden" +msgstr "Knoten konnte nicht in seinem Hash gefunden werden" #: apt-inst/extract.cc:284 msgid "The path is too long" @@ -1614,12 +1626,12 @@ msgstr "Der Pfad ist zu lang" #: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Überschreibe Paket-Treffer ohne Version für %s" +msgstr "Paket-Treffer ohne Version für %s wird überschrieben" #: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Datei %s/%s überschreibt die Datei in Paket %s" +msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. @@ -1630,31 +1642,32 @@ msgstr "Datei %s/%s überschreibt die Datei in Paket %s" #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" -msgstr "Kann %s nicht lesen" +msgstr "%s kann nicht gelesen werden" #: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" -msgstr "Kann kein »stat« auf %s durchführen" +msgstr "»stat« konnte nicht auf %s ausgeführt werden" #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 #, c-format msgid "Failed to remove %s" -msgstr "Konnte %s nicht entfernen" +msgstr "%s konnte nicht entfernt werden" #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 #, c-format msgid "Unable to create %s" -msgstr "Konnte %s nicht erzeugen" +msgstr "%s konnte nicht erzeugt werden" #: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Konnte kein »stat« auf %sinfo durchführen" +msgstr "»stat« konnte nicht auf %sinfo ausgeführt werden" #: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Die »info«- und »temp«-Verzeichnisse müssen im selben Dateisystem liegen" +msgstr "" +"Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem liegen" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 @@ -1666,7 +1679,7 @@ msgstr "Paketlisten werden gelesen" #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Kann nicht ins Administrationsverzeichnis %sinfo wechseln" +msgstr "Wechsel in das Administrationsverzeichnis %sinfo fehlgeschlagen" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 @@ -1723,7 +1736,7 @@ msgstr "Der Paket-Cache muss erst initialisiert werden" #: apt-inst/deb/dpkgdb.cc:439 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Konnte keine »Package:«-Kopfzeile finden, Offset %lu" +msgstr "Es konnte keine »Package:«-Kopfzeile gefunden werden, Offset %lu" #: apt-inst/deb/dpkgdb.cc:461 #, c-format @@ -1749,32 +1762,32 @@ msgstr "" #: apt-inst/deb/debfile.cc:110 #, c-format msgid "Couldn't change to %s" -msgstr "Konnte nicht in %s wechseln" +msgstr "Wechsel nach %s nicht möglich" #: apt-inst/deb/debfile.cc:140 msgid "Internal error, could not locate member" -msgstr "Interner Fehler, konnte Bestandteil nicht finden" +msgstr "Interner Fehler, Bestandteil konnte nicht gefunden werden" #: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "Konnte gültige »control«-Datei nicht finden" +msgstr "Es konnte keine gültige »control«-Datei gefunden werden" #: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" -msgstr "Nicht einlesbare »control«-Datei" +msgstr "Auswerten der »control«-Datei nicht möglich" #: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "Kann CD-ROM-Datenbank %s nicht lesen" +msgstr "CD-ROM-Datenbank %s kann nicht gelesen werden" #: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"Bitte verwenden Sie apt-cdrom, um diese CD-ROM für APT erkennbar zu machen. " -"apt-get update kann nicht dazu verwendet werden, neue CD-ROMs hinzuzufügen" +"Bitte verwenden Sie apt-cdrom, um APT diese CD-ROM bekannt zu machen. apt-" +"get update kann nicht dazu verwendet werden, neue CD-ROMs hinzuzufügen" #: methods/cdrom.cc:219 msgid "Wrong CD-ROM" @@ -1784,8 +1797,8 @@ msgstr "Falsche CD-ROM" #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -"Kann Einbindung von CD-ROM in %s nicht lösen, möglicherweise wird sie noch " -"verwendet." +"Einbindung von CD-ROM in %s kann nicht gelöst werden, möglicherweise wird " +"sie noch verwendet." #: methods/cdrom.cc:250 msgid "Disk not found." @@ -1799,11 +1812,11 @@ msgstr "Datei nicht gefunden" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 #: methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" -msgstr "Konnte kein »stat« durchführen." +msgstr "»stat« konnte nicht ausgeführt werden." #: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Kann Änderungszeitpunkt nicht setzen" +msgstr "Änderungszeitpunkt kann nicht gesetzt werden" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1812,20 +1825,20 @@ msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:167 msgid "Logging in" -msgstr "Logge ein" +msgstr "Anmeldung läuft" #: methods/ftp.cc:173 msgid "Unable to determine the peer name" -msgstr "Kann Namen des Kommunikationspartners nicht bestimmen" +msgstr "Name des Kommunikationspartners kann nicht bestimmt werden" #: methods/ftp.cc:178 msgid "Unable to determine the local name" -msgstr "Kann lokalen Namen nicht bestimmen" +msgstr "Lokaler Name kann nicht bestimmt werden" #: methods/ftp.cc:209 methods/ftp.cc:237 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Der Server hat die Verbindung abgelehnt: %s" +msgstr "Verbindung durch Server abgelehnt: %s" #: methods/ftp.cc:215 #, c-format @@ -1842,13 +1855,13 @@ msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Es war ein Proxy-Server angegeben, aber kein Einlogg-Skript, Acquire::ftp::" +"Es war ein Proxy-Server angegeben, aber kein Login-Skript, Acquire::ftp::" "ProxyLogin ist leer." #: methods/ftp.cc:270 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Befehl »%s« des Einlog-Skriptes ist fehlgeschlagen: %s" +msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen: %s" #: methods/ftp.cc:296 #, c-format @@ -1861,7 +1874,7 @@ msgstr "Zeitüberschreitung der Verbindung" #: methods/ftp.cc:340 msgid "Server closed the connection" -msgstr "Der Server hat die Verbindung geschlossen" +msgstr "Verbindung durch Server geschlossen" #: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" @@ -1869,7 +1882,7 @@ msgstr "Lesefehler" #: methods/ftp.cc:350 methods/rsh.cc:197 msgid "A response overflowed the buffer." -msgstr "Eine Antwort hat den Puffer zum Überlaufen gebracht." +msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." #: methods/ftp.cc:367 methods/ftp.cc:379 msgid "Protocol corruption" @@ -1881,35 +1894,37 @@ msgstr "Schreibfehler" #: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 msgid "Could not create a socket" -msgstr "Konnte kein Socket erzeugen" +msgstr "Socket konnte nicht erzeugt werden" #: methods/ftp.cc:703 msgid "Could not connect data socket, connection timed out" -msgstr "Konnte Daten-Socket wegen Zeitüberschreitung nicht verbinden" +msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden" #: methods/ftp.cc:709 msgid "Could not connect passive socket." -msgstr "Konnte passiven Socket nicht verbinden." +msgstr "Passiver Socket konnte nicht verbunden werden." #: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" -msgstr "Die Funktion getaddrinfo konnte keinen lauschenden Socket finden" +msgstr "" +"Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket " +"gefunden" #: methods/ftp.cc:741 msgid "Could not bind a socket" -msgstr "Konnte ein Socket nicht verbinden" +msgstr "Verbindung des Sockets nicht möglich" #: methods/ftp.cc:745 msgid "Could not listen on the socket" -msgstr "Konnte auf dem Socket nicht lauschen" +msgstr "Warten auf Verbindungen auf dem Socket nicht möglich" #: methods/ftp.cc:752 msgid "Could not determine the socket's name" -msgstr "Konnte den Namen des Sockets nicht bestimmen" +msgstr "Name des Sockets konnte nicht bestimmt werden" #: methods/ftp.cc:784 msgid "Unable to send PORT command" -msgstr "Konnte PORT-Befehl nicht senden" +msgstr "PORT-Befehl konnte nicht gesendet werden" #: methods/ftp.cc:794 #, c-format @@ -1927,7 +1942,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" #: methods/ftp.cc:830 msgid "Unable to accept connection" -msgstr "Kann Verbindung nicht annehmen" +msgstr "Verbindung konnte nicht angenommen werden" #: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 msgid "Problem hashing file" @@ -1936,7 +1951,7 @@ msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" #: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Kann Datei nicht holen, Server antwortete: »%s«" +msgstr "Datei konnte nicht heruntergeladen werden; Antwort vom Server: »%s«" #: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1945,7 +1960,7 @@ msgstr "Datenverbindung erlitt Zeitüberschreitung" #: methods/ftp.cc:927 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datenübertragung fehlgeschlagen, Server antwortete: »%s«" +msgstr "Datenübertragung fehlgeschlagen; Antwort vom Server: »%s«" #. Get the files information #: methods/ftp.cc:1002 @@ -1954,12 +1969,12 @@ msgstr "Abfrage" #: methods/ftp.cc:1114 msgid "Unable to invoke " -msgstr "Kann nicht aufrufen: " +msgstr "Kann nicht aufgerufen werden: " #: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" -msgstr "Verbinde mit %s (%s)" +msgstr "Verbindung mit %s (%s)" #: methods/connect.cc:81 #, c-format @@ -1969,36 +1984,36 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:90 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Konnte kein Socket für %s erzeugen (f=%u t=%u p=%u)" +msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)" #: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Kann keine Verbindung mit %s:%s aufbauen (%s)." +msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)." #: methods/connect.cc:104 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -"Konnte keine Verbindung mit %s:%s aufbauen (%s), eine Zeitüberschreitung " -"trat auf" +"Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine " +"Zeitüberschreitung trat auf" #: methods/connect.cc:119 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Konnte nicht mit %s:%s verbinden (%s)." +msgstr "Verbindung mit %s:%s nicht möglich (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going #: methods/connect.cc:147 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" -msgstr "Verbinde mit %s" +msgstr "Verbindung mit %s" #: methods/connect.cc:165 methods/connect.cc:184 #, c-format msgid "Could not resolve '%s'" -msgstr "Konnte »%s« nicht auflösen" +msgstr "»%s« konnte nicht aufgelöst werden" #: methods/connect.cc:190 #, c-format @@ -2012,13 +2027,14 @@ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" #: methods/connect.cc:240 #, fuzzy, c-format +#| msgid "Unable to connect to %s %s:" msgid "Unable to connect to %s:%s:" -msgstr "Kann nicht mit %s %s verbinden:" +msgstr "Verbindung mit %s %s nicht möglich:" #: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "Konnte nicht auf Schlüsselring zugreifen: »%s«" +msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«" #: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." @@ -2028,8 +2044,8 @@ msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch." msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Interner Fehler: Gültige Signatur, aber konnte den Fingerabdruck des " -"Schlüssels nicht ermitteln?!" +"Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " +"jedoch nicht ermittelt werden?!" #: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." @@ -2039,7 +2055,7 @@ msgstr "Mindestens eine ungültige Signatur wurde entdeckt." #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -"Konnte »%s« zum Überprüfen der Signatur nicht ausführen (ist gpgv " +"»%s« zur Überprüfung der Signatur konnte nicht ausgeführt werden (ist gpgv " "installiert?)" #: methods/gpgv.cc:237 @@ -2062,7 +2078,7 @@ msgstr "" #: methods/gzip.cc:64 #, c-format msgid "Couldn't open pipe for %s" -msgstr "Konnte keine Pipe (Weiterleitung) für %s öffnen" +msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden" #: methods/gzip.cc:109 #, c-format @@ -2071,12 +2087,12 @@ msgstr "Lesefehler von Prozess %s" #: methods/http.cc:384 msgid "Waiting for headers" -msgstr "Warte auf Kopfzeilen" +msgstr "Warten auf Kopfzeilen" #: methods/http.cc:530 #, c-format msgid "Got a single header line over %u chars" -msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen" +msgstr "Einzelne Kopfzeile aus %u Zeichen erhalten" #: methods/http.cc:538 msgid "Bad header line" @@ -2084,19 +2100,20 @@ msgstr "Ungültige Kopfzeile" #: methods/http.cc:557 methods/http.cc:564 msgid "The HTTP server sent an invalid reply header" -msgstr "Der HTTP-Server sandte eine ungültige Antwort-Kopfzeile" +msgstr "Vom·HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt" #: methods/http.cc:593 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Der HTTP-Server sandte eine ungültige »Content-Length«-Kopfzeile" +msgstr "Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt" #: methods/http.cc:608 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Der HTTP-Server sandte eine ungültige »Content-Range«-Kopfzeile" +msgstr "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt" #: methods/http.cc:610 msgid "This HTTP server has broken range support" -msgstr "Der HTTP-Server unterstützt Datei-Teilübertragung nur fehlerhaft." +msgstr "" +"Teilweise Dateiübertragung·wird vom HTTP-Server nur fehlerhaft unterstützt." #: methods/http.cc:634 msgid "Unknown date format" @@ -2125,8 +2142,8 @@ msgstr "Fehler beim Schreiben der Datei" #: methods/http.cc:888 msgid "Error reading from server. Remote end closed connection" msgstr "" -"Fehler beim Lesen vom Server: Der Server am anderen Ende hat die Verbindung " -"geschlossen" +"Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " +"anderen Seite geschlossen" #: methods/http.cc:890 msgid "Error reading from server" @@ -2134,7 +2151,7 @@ msgstr "Fehler beim Lesen vom Server" #: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" -msgstr "Konnte Datei nicht einkürzen" +msgstr "Datei konnte nicht eingekürzt werden" #: methods/http.cc:1146 msgid "Bad header data" @@ -2150,12 +2167,12 @@ msgstr "Interner Fehler" #: apt-pkg/contrib/mmap.cc:76 msgid "Can't mmap an empty file" -msgstr "Kann eine leere Datei nicht mit mmap abbilden" +msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden" #: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 #, c-format msgid "Couldn't make mmap of %lu bytes" -msgstr "Konnte kein mmap von %lu Bytes durchführen" +msgstr "mmap von %lu Bytes konnte nicht durchgeführt werden" #: apt-pkg/contrib/mmap.cc:234 #, c-format @@ -2208,7 +2225,7 @@ msgstr "Öffne Konfigurationsdatei %s" #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Syntaxfehler %s:%u: Block fängt ohne Namen an." +msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen." #: apt-pkg/contrib/configuration.cc:703 #, c-format @@ -2229,7 +2246,7 @@ msgstr "" #: apt-pkg/contrib/configuration.cc:767 #, c-format msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (include)" +msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)" #: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 #, c-format @@ -2265,12 +2282,12 @@ msgstr "Kommandozeilenoption »%c« [aus %s] ist nicht bekannt." #: apt-pkg/contrib/cmndline.cc:119 #, c-format msgid "Command line option %s is not understood" -msgstr "Kommandozeilenoption %s wird nicht verstanden" +msgstr "Kommandozeilenoption %s konnte nicht ausgewertet werden" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "Kommandozeilenoption %s ist nicht Boole'sch" +msgstr "Kommandozeilenoption %s ist nicht Bool'sch" #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format @@ -2280,7 +2297,7 @@ msgstr "Option %s erfordert ein Argument." #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Option %s: Konfigurationswertspezifikation muss =<wert> enthalten." +msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<wert>«." #: apt-pkg/contrib/cmndline.cc:234 #, c-format @@ -2306,32 +2323,32 @@ msgstr "Ungültige Operation %s." #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Kann kein »stat« auf dem Einhängepunkt %s durchführen." +msgstr "»stat« konnte nicht auf den Einhängepunkt %s ausgeführt werden." #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 #, c-format msgid "Unable to change to %s" -msgstr "Kann nicht nach %s wechseln" +msgstr "Es konnte nicht nach %s gewechselt werden" #: apt-pkg/contrib/cdromutl.cc:195 msgid "Failed to stat the cdrom" -msgstr "Konnte kein »stat« auf der CD-ROM durchführen" +msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden" #: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Benutze keine Sperre für schreibgeschützte Lockdatei %s" +msgstr "Es wird keine Sperre für schreibgeschützte Lockdatei %s verwendet" #: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Could not open lock file %s" -msgstr "Konnte Lockdatei %s nicht öffnen" +msgstr "Lockdatei %s konnte nicht geöffnet werden" #: apt-pkg/contrib/fileutl.cc:172 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Benutze keine Sperre für NFS-eingebundene Lockdatei %s" +msgstr "Es wird keine Sperre für per NFS eingebundene Lockdatei %s verwendet" #: apt-pkg/contrib/fileutl.cc:176 #, c-format @@ -2341,42 +2358,44 @@ msgstr "Konnte Lock %s nicht bekommen" #: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "Auf %s gewartet, aber es war nicht da" +msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" #: apt-pkg/contrib/fileutl.cc:456 #, c-format msgid "Sub-process %s received a segmentation fault." -msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." +msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." #: apt-pkg/contrib/fileutl.cc:458 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "Unterprozess %s hat einen Speicherzugriffsfehler erhalten." +msgstr "Unterprozess %s hat Signal %u empfangen." #: apt-pkg/contrib/fileutl.cc:462 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Unterprozess %s ist mit einem Fehlercode zurückgekehrt (%u)" +msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" #: apt-pkg/contrib/fileutl.cc:464 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Unterprozess %s hat sich unerwartet beendet" +msgstr "Unterprozess %s unerwartet beendet" #: apt-pkg/contrib/fileutl.cc:508 #, c-format msgid "Could not open file %s" -msgstr "Konnte Datei %s nicht öffnen" +msgstr "Datei %s konnte nicht geöffnet werden" #: apt-pkg/contrib/fileutl.cc:564 #, c-format msgid "read, still have %lu to read but none left" -msgstr "Lese, habe noch %lu zu lesen, aber nichts mehr übrig" +msgstr "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig" #: apt-pkg/contrib/fileutl.cc:594 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "Schreiben, habe noch %lu zu schreiben, konnte aber nicht" +msgstr "" +"Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben nicht " +"möglich" #: apt-pkg/contrib/fileutl.cc:669 msgid "Problem closing the file" @@ -2388,7 +2407,7 @@ msgstr "Beim Unlinking der Datei trat ein Problem auf" #: apt-pkg/contrib/fileutl.cc:686 msgid "Problem syncing the file" -msgstr "Beim Synchronisieren einer Datei trat ein Problem auf" +msgstr "Beim Synchronisieren der Datei trat ein Problem auf" #: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" @@ -2405,7 +2424,7 @@ msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor" #: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Dieses APT unterstützt das Versionssystem »%s« nicht" +msgstr "Das·Versionssystem·»%s« wird durch dieses APT nicht unterstützt" #: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" @@ -2481,27 +2500,27 @@ msgstr "Abhängigkeits-Generierung" #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" -msgstr "Lese Status-Informationen ein" +msgstr "Status-Informationen einlesen" #: apt-pkg/depcache.cc:223 #, c-format msgid "Failed to open StateFile %s" -msgstr "Konnte Statusdatei %s nicht öffnen" +msgstr "Statusdatei %s konnte nicht geöffnet werden" #: apt-pkg/depcache.cc:229 #, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Konnte temporäre Statusdatei %s nicht schreiben" +msgstr "Temporäre Statusdatei %s konnte nicht geschrieben werden" #: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (1)" -msgstr "Kann Paketdatei %s nicht verarbeiten (1)" +msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)" #: apt-pkg/tagfile.cc:189 #, c-format msgid "Unable to parse package file %s (2)" -msgstr "Kann Paketdatei %s nicht verarbeiten (2)" +msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)" #: apt-pkg/sourcelist.cc:90 #, c-format @@ -2575,20 +2594,21 @@ msgstr "Indexdateityp »%s« wird nicht unterstützt" msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -"Das Paket %s muss neu installiert werden, ich kann aber kein Archiv dafür " -"finden." +"Das Paket %s muss neu installiert werden, es kann jedoch kein Archiv dafür " +"gefunden werden." #: apt-pkg/algorithms.cc:1138 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Fehler: pkgProblemResolver::Resolve hat Unterbrechungen hervorgerufen, dies " -"könnte durch gehaltene Pakete hervorgerufen worden sein." +"Fehler: Unterbrechungen hervorgerufen durch pkgProblemResolver::Resolve; " +"dies könnte durch gehaltene Pakete hervorgerufen worden sein." #: apt-pkg/algorithms.cc:1140 msgid "Unable to correct problems, you have held broken packages." -msgstr "Kann Probleme nicht korrigieren, Sie haben gehaltene defekte Pakete." +msgstr "" +"Probleme können nicht korrigiert werden, Sie haben gehaltene defekte Pakete." #: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417 msgid "" @@ -2613,12 +2633,12 @@ msgstr "Archivverzeichnis %spartial fehlt." #: apt-pkg/acquire.cc:826 #, c-format msgid "Retrieving file %li of %li (%s remaining)" -msgstr "Hole Datei %li von %li (noch %s)" +msgstr "Holen der Datei %li von %li (noch %s)" #: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li" -msgstr "Hole Datei %li von %li" +msgstr "Holen der Datei %li von %li" #: apt-pkg/acquire-worker.cc:110 #, c-format @@ -2634,8 +2654,8 @@ msgstr "Methode %s ist nicht korrekt gestartet" #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« und drücken Sie " -"die Eingabetaste." +"Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und drücken " +"Sie die Eingabetaste." #: apt-pkg/init.cc:132 #, c-format @@ -2644,18 +2664,18 @@ msgstr "Paketierungssystem »%s« wird nicht unterstützt" #: apt-pkg/init.cc:148 msgid "Unable to determine a suitable packaging system type" -msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen" +msgstr "Bestimmung eines passenden Paketierungssystem-Typs nicht möglich" #: apt-pkg/clean.cc:56 #, c-format msgid "Unable to stat %s." -msgstr "Kann kein »stat« auf %s durchführen." +msgstr "»stat« kann nicht auf %s ausgeführt werden." #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" msgstr "" -"Sie müssen einige »source«-URIs für Quellen in die sources.list-Datei " -"schreiben." +"Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei " +"eintragen." #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." @@ -2668,14 +2688,14 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." #: apt-pkg/policy.cc:347 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ungültiger Eintrag in Einstellungsdatei, keine »Package«-Kopfzeilen" +msgstr "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeilen" #: apt-pkg/policy.cc:369 #, c-format msgid "Did not understand pin type %s" -msgstr "Konnte Pinning-Typ (pin type) %s nicht verstehen" +msgstr "Pinning-Typ (pin type) %s nicht verständlich" #: apt-pkg/policy.cc:377 msgid "No priority (or zero) specified for pin" @@ -2773,7 +2793,7 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:693 #, c-format msgid "Couldn't stat source package list %s" -msgstr "Konnte kein »stat« auf der Liste %s der Quellpakete durchführen." +msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." #: apt-pkg/pkgcachegen.cc:778 msgid "Collecting File Provides" @@ -2807,8 +2827,9 @@ msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " -"dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)." +"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " +"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " +"Architektur)." #: apt-pkg/acquire-item.cc:1275 #, c-format @@ -2816,8 +2837,8 @@ msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Ich konnte keine Datei für Paket %s finden. Das könnte heißen, dass Sie " -"dieses Paket von Hand korrigieren müssen." +"Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " +"Sie dieses Paket von Hand korrigieren müssen." #: apt-pkg/acquire-item.cc:1316 #, c-format @@ -2831,19 +2852,19 @@ msgid "Size mismatch" msgstr "Größe stimmt nicht überein" #: apt-pkg/indexrecords.cc:40 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "Kann Paketdatei %s nicht verarbeiten (1)" +msgstr "Release-Datei %s kann nicht verarbeitet werden" #: apt-pkg/indexrecords.cc:47 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "Hinweis: wähle %s an Stelle von %s\n" +msgstr "Keine Abschnitte in Release-Datei %s" #: apt-pkg/indexrecords.cc:81 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "Kein Hash-Eintrag in Release-Datei %s" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2856,12 +2877,12 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Benutze CD-ROM-Einhängepunkt %s\n" -"Hänge CD-ROM ein\n" +"Verwendeter CD-ROM-Einhängepunkt: %s\n" +"CD-ROM wird eingehangen\n" #: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 msgid "Identifying.. " -msgstr "Identifiziere ... " +msgstr "Identifizieren ... " #: apt-pkg/cdrom.cc:559 #, c-format @@ -2870,29 +2891,29 @@ msgstr "Gespeicherte Kennzeichnung: %s\n" #: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM...\n" -msgstr "Hänge CD-ROM aus ...\n" +msgstr "CD-ROM wird ausgehangen ...\n" #: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Benutze CD-ROM-Einhängepunkt %s\n" +msgstr "Verwendeter CD-ROM-Einhängepunkt: %s\n" #: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" -msgstr "Hänge CD-ROM aus\n" +msgstr "CD-ROM wird ausgehangen\n" #: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" -msgstr "Warte auf Disk ...\n" +msgstr "Warten auf Disk ...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" -msgstr "Hänge CD-ROM ein ...\n" +msgstr "CD-ROM wird eingehangen ...\n" #: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" -msgstr "Suche auf CD nach Index-Dateien ...\n" +msgstr "Durchsuchung der CD nach Index-Dateien ...\n" #: apt-pkg/cdrom.cc:673 #, c-format @@ -2900,19 +2921,21 @@ msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" "zu signatures\n" msgstr "" -"Fand %zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu " -"Signaturen\n" +"%zu Paketindizes, %zu Quellindizes, %zu Übersetzungsindizes und %zu " +"Signaturen gefunden\n" #: apt-pkg/cdrom.cc:684 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine " +"Debian-CD oder eine für die falsche Architektur?" #: apt-pkg/cdrom.cc:710 #, c-format msgid "Found label '%s'\n" -msgstr "Fand Kennzeichnung »%s«\n" +msgstr "Kennzeichnung »%s« gefunden\n" #: apt-pkg/cdrom.cc:739 msgid "That is not a valid name, try again.\n" @@ -2929,11 +2952,11 @@ msgstr "" #: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." -msgstr "Kopiere Paketlisten..." +msgstr "Kopieren der Paketlisten..." #: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" -msgstr "Schreibe neue Quellliste\n" +msgstr "Schreiben der neuen Quellliste\n" #: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" @@ -2964,12 +2987,12 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" -msgstr "Installiere %s" +msgstr "Installieren von %s" #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Configuring %s" -msgstr "Konfiguriere %s" +msgstr "Konfigurieren von %s" #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 #, c-format @@ -2979,7 +3002,7 @@ msgstr "%s wird entfernt" #: apt-pkg/deb/dpkgpm.cc:52 #, c-format msgid "Running post-installation trigger %s" -msgstr "Rufe Nach-Installations-Trigger %s auf" +msgstr "Aufruf des Nach-Installations-Triggers %s" #: apt-pkg/deb/dpkgpm.cc:557 #, c-format @@ -3019,7 +3042,7 @@ msgstr "%s entfernt" #: apt-pkg/deb/dpkgpm.cc:673 #, c-format msgid "Preparing to completely remove %s" -msgstr "Komplettes Entfernen von %s wird vorbereitet" +msgstr "Vollständiges Entfernen von %s wird vorbereitet" #: apt-pkg/deb/dpkgpm.cc:674 #, c-format @@ -3029,12 +3052,12 @@ msgstr "%s vollständig entfernt" #: apt-pkg/deb/dpkgpm.cc:878 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -"Kann Protokoll nicht schreiben, openpty() schlug fehl (/dev/pts nicht " -"eingehangen?)\n" +"Schreiben des Protokolls nicht möglich, openpty() schlug fehl (/dev/pts " +"nicht eingehangen?)\n" #: apt-pkg/deb/dpkgpm.cc:907 msgid "Running dpkg" -msgstr "" +msgstr "Ausführen von dpkg" #: apt-pkg/deb/debsystem.cc:70 #, c-format @@ -3042,17 +3065,22 @@ msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" +"Sperren des Administrationsverzeichnisses (%s) nicht möglich, wird es von " +"einem anderen Prozess verwendet?" #: apt-pkg/deb/debsystem.cc:73 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Kann das Listenverzeichnis nicht sperren" +msgstr "" +"Sperren des Administrationsverzeichnisses (%s) nicht möglich, sind Sie root?" #: apt-pkg/deb/debsystem.cc:82 msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " msgstr "" +"Der dpkg-Prozess wurde abgebrochen; Sie müssen »dpkg --configure -a« manuell " +"ausführen, um das Problem zu beheben." #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" @@ -3060,14 +3088,8 @@ msgstr "Nicht gesperrt" #: methods/rred.cc:219 msgid "Could not patch file" -msgstr "Konnte Datei nicht patchen" +msgstr "Datei konnte nicht gepatcht werden" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "Verbindung zu früh beendet" - -#~ msgid "%4i %s\n" -#~ msgstr "%4i %s\n" - -#~ msgid "Processing triggers for %s" -#~ msgstr "Verarbeite Auslöser (Trigger) für %s" +msgstr "Verbindung vorzeitig beendet" -- cgit v1.2.3-70-g09d2 From c1ce032acd71b8414ee8d9a1f20899f8e53388a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 20 Oct 2009 08:30:21 +0200 Subject: only warn if (free) space can't be determined as it overflows the struct as this prevents e.g. download operations on large RAIDs (Closes: #522238) --- cmdline/apt-get.cc | 24 ++++--- debian/changelog | 1 + po/apt-all.pot | 195 +++++++++++++++++++++++++++-------------------------- 3 files changed, 115 insertions(+), 105 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ca14f4c2b..49fde7466 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -862,10 +862,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true, { struct statvfs Buf; string OutputDir = _config->FindDir("Dir::Cache::Archives"); - if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs",_("Couldn't determine free space in %s"), - OutputDir.c_str()); - if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) + if (statvfs(OutputDir.c_str(),&Buf) != 0) { + if (errno == EOVERFLOW) + return _error->WarningE("statvfs",_("Couldn't determine free space in %s"), + OutputDir.c_str()); + else + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), + OutputDir.c_str()); + } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) { struct statfs Stat; if (statfs(OutputDir.c_str(),&Stat) != 0 @@ -2228,10 +2232,14 @@ bool DoSource(CommandLine &CmdL) // Check for enough free space struct statvfs Buf; string OutputDir = "."; - if (statvfs(OutputDir.c_str(),&Buf) != 0) - return _error->Errno("statvfs",_("Couldn't determine free space in %s"), - OutputDir.c_str()); - if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) + if (statvfs(OutputDir.c_str(),&Buf) != 0) { + if (errno == EOVERFLOW) + return _error->WarningE("statvfs",_("Couldn't determine free space in %s"), + OutputDir.c_str()); + else + return _error->Errno("statvfs",_("Couldn't determine free space in %s"), + OutputDir.c_str()); + } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize) { struct statfs Stat; if (statfs(OutputDir.c_str(),&Stat) != 0 diff --git a/debian/changelog b/debian/changelog index 82b08619d..abfb7aa3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ apt (0.7.25) UNRELEASED; urgency=low - source should displays his final pkg pick (Closes: #249383, #550952) - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) + - only warn if (free) space overflows (Closes: #522238) [ Julian Andres Klode ] * doc/apt.conf.5.xml: diff --git a/po/apt-all.pot b/po/apt-all.pot index f464ef198..46910b1a2 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-19 21:03+0200\n" +"POT-Creation-Date: 2009-10-20 08:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,7 +151,7 @@ msgstr "" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2645 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1714 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -692,7 +692,7 @@ msgstr "" msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "" @@ -708,11 +708,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2056 cmdline/apt-get.cc:2089 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2137 cmdline/apt-get.cc:2386 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -741,25 +741,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -767,74 +768,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2283 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2292 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -842,84 +843,84 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1301 cmdline/apt-get.cc:1363 +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1307 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1328 +#: cmdline/apt-get.cc:1332 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1392 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1448 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1497 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1503 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -#: cmdline/apt-get.cc:1500 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -935,49 +936,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1508 cmdline/apt-get.cc:1798 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1512 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1701 cmdline/apt-get.cc:1737 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1724 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1755 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1783 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -985,152 +986,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1801 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1830 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1920 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1949 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1952 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2024 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2132 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2162 cmdline/apt-get.cc:2404 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2211 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2242 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2251 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2288 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2316 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2328 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2329 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2365 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2381 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2409 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2481 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2534 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2570 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2597 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2613 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2618 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2650 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2691 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1174,7 +1175,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2858 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -2308,26 +2309,26 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 #, c-format msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:474 +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" -"Could not perform immediate configuration for on already unpacked %s.Please " -"see man 5 apt.conf under APT::Immediate-Configure for details." +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/packagemanager.cc:575 +#: apt-pkg/packagemanager.cc:475 #, c-format msgid "" -"Could not perform immediate configuration on %s.Please see man 5 apt.conf " -"under APT::Immediate-Configure for details." +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." msgstr "" #: apt-pkg/pkgrecords.cc:32 -- cgit v1.2.3-70-g09d2 From ce26dee77d08876b2022ce480c8f7dd616f94df1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 20 Oct 2009 23:32:27 +0200 Subject: * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors --- debian/changelog | 2 ++ methods/connect.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index abfb7aa3f..cd5f95016 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,8 @@ apt (0.7.25) UNRELEASED; urgency=low - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) + * methods/connect.cc: + - display also strerror of "wicked" getaddrinfo errors [ Julian Andres Klode ] * doc/apt.conf.5.xml: diff --git a/methods/connect.cc b/methods/connect.cc index b5f48907e..74e670ebd 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -190,8 +190,8 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, return _error->Error(_("Temporary failure resolving '%s'"), Host.c_str()); } - return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"), - Host.c_str(),ServStr,Res); + return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"), + Host.c_str(),ServStr,Res,gai_strerror(Res)); } break; } -- cgit v1.2.3-70-g09d2 From f4945db34053338ceb832afa1ca51e2aab7edaa0 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 21 Oct 2009 13:28:10 +0200 Subject: * apt-pkg/packagemanager.cc: - add output about pre-depends configuring when debug::pkgPackageManager is used --- apt-pkg/packagemanager.cc | 7 +++++++ debian/changelog | 3 +++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index cc9ce21c7..a063e1a34 100644 --- a/apt-pkg/packagemanager.cc +++ b/apt-pkg/packagemanager.cc @@ -477,6 +477,9 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) while (End->Type == pkgCache::Dep::PreDepends) { + if (Debug == true) + clog << "PreDepends order for " << Pkg.Name() << std::endl; + // Look for possible ok targets. SPtrArray<Version *> VList = Start.AllTargets(); bool Bad = true; @@ -490,6 +493,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) Pkg.State() == PkgIterator::NeedsNothing) { Bad = false; + if (Debug == true) + clog << "Found ok package " << Pkg.Name() << endl; continue; } } @@ -505,6 +510,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg) (Cache[Pkg].Keep() == true && Pkg.State() == PkgIterator::NeedsNothing)) continue; + if (Debug == true) + clog << "Trying to SmartConfigure " << Pkg.Name() << endl; Bad = !SmartConfigure(Pkg); } diff --git a/debian/changelog b/debian/changelog index 16e8929ad..618e855ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.22.4) unstable; urgency=low (thanks to Simon Richter, closes: #509866) * apt-inst/contrib/arfile.cc: - show propper error message for Invalid archive members + * apt-pkg/packagemanager.cc: + - add output about pre-depends configuring when debug::pkgPackageManager + is used [ Loïc Minier ] * cmdline/apt-key: -- cgit v1.2.3-70-g09d2 From 5cbf7810a2d9f8905015d8a7879df095cfb6d6ea Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Oct 2009 14:12:01 +0200 Subject: Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2 Backported from lp:~mvo/apt/debian-experimental Patch by Eugene V. Lyubimkin --- apt-pkg/contrib/strutl.h | 12 ++++++------ debian/changelog | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 0cbf14a7a..2b2e147fb 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -68,15 +68,15 @@ int tolower_ascii(int c); #define APT_MKSTRCMP(name,func) \ inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \ inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ -inline int name(string A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \ -inline int name(string A,string B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \ -inline int name(string A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);}; +inline int name(const string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \ +inline int name(const string& A,const string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \ +inline int name(const string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);}; #define APT_MKSTRCMP2(name,func) \ inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \ -inline int name(string A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \ -inline int name(string A,string B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \ -inline int name(string A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);}; +inline int name(const string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \ +inline int name(const string& A,const string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \ +inline int name(const string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);}; int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd); int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd); diff --git a/debian/changelog b/debian/changelog index cd5f95016..80369e8e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,10 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + [ Eugene V. Lyubimkin ] + * apt-pkg/contib/strutl.h + - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2. + [ Julian Andres Klode ] * doc/apt.conf.5.xml: - Deprecate unquoted values, string concatenation and explain what should -- cgit v1.2.3-70-g09d2 From 10c9f030e02ccec5c002abc42776f994c124c574 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 24 Oct 2009 17:38:06 +0200 Subject: Bumped libapt version and excluded eglibc from SONAME. (Closes: #448249) Backported from lp:~mvo/apt/debian-experimental Based on patch by Eugene V. Lyubimkin --- apt-inst/makefile | 3 +-- apt-pkg/init.h | 4 ++-- apt-pkg/makefile | 5 ++--- buildlib/library.mak | 16 ++++++++-------- debian/changelog | 2 ++ debian/rules | 14 +++++++------- methods/makefile | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'debian') diff --git a/apt-inst/makefile b/apt-inst/makefile index cc61841b9..c0ff3d886 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -11,8 +11,7 @@ include ../buildlib/defaults.mak # The library name LIBRARY=apt-inst -LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=1.1 +MAJOR=1.2 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 44d1d107c..44a57eb45 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -18,8 +18,8 @@ // See the makefile #define APT_PKG_MAJOR 4 -#define APT_PKG_MINOR 8 -#define APT_PKG_RELEASE 1 +#define APT_PKG_MINOR 9 +#define APT_PKG_RELEASE 0 extern const char *pkgVersion; extern const char *pkgLibVersion; diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 7816ecf0d..80038e28e 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -12,9 +12,8 @@ include ../buildlib/defaults.mak # The library name, don't forget to update init.h and the copy in # methods/makefile - FIXME LIBRARY=apt-pkg -LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) -MAJOR=4.8 -MINOR=1 +MAJOR=4.9 +MINOR=0 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl APT_DOMAIN:=libapt-pkg$(MAJOR) diff --git a/buildlib/library.mak b/buildlib/library.mak index de8833cbb..029e87463 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -5,7 +5,7 @@ # Input # $(SOURCE) - The source code to use # $(HEADERS) - Exported header files and private header files -# $(LIBRARY) - The name of the library without lib or .so +# $(LIBRARY) - The name of the library without lib or .so # $(MAJOR) - The major version number of this library # $(MINOR) - The minor version number of this library # $(APT_DOMAIN) - The text domain for this library @@ -16,11 +16,11 @@ # See defaults.mak for information about LOCAL # Some local definitions -LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) +LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR) $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE))))) $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE))))) $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS)) -$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) +$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR) $(LOCAL)-SLIBS := $(SLIBS) $(LOCAL)-LIBRARY := $(LIBRARY) @@ -29,7 +29,7 @@ include $(PODOMAIN_H) # Install the command hooks headers: $($(LOCAL)-HEADERS) -library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) +library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR) clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) @@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL) -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so* # Build rules for the two symlinks -.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so -$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) +.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so +$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ -$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) +$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ # The binary build rule -$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) +$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ diff --git a/debian/changelog b/debian/changelog index 80369e8e7..e7a7e1c49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ apt (0.7.25) UNRELEASED; urgency=low [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2. + * build infrastructure: + - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249) [ Julian Andres Klode ] * doc/apt.conf.5.xml: diff --git a/debian/rules b/debian/rules index d19531dfc..d1b77e172 100755 --- a/debian/rules +++ b/debian/rules @@ -79,21 +79,21 @@ export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2) # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR) +LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) +LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets # the right overrides.. rm -rf $@ $@.apt $@.apt-utils - echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ build: build/build-stamp build-doc: build/build-doc-stamp diff --git a/methods/makefile b/methods/makefile index 134166ba3..f5d80d839 100644 --- a/methods/makefile +++ b/methods/makefile @@ -7,7 +7,7 @@ include ../buildlib/defaults.mak BIN := $(BIN)/methods # FIXME.. -LIB_APT_PKG_MAJOR = 4.8 +LIB_APT_PKG_MAJOR = 4.9 APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) # The file method -- cgit v1.2.3-70-g09d2 From 23d8465817e7bc0d188f36fc2ad14f41ff01c221 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 28 Oct 2009 19:13:56 +0100 Subject: refactor the buildsystem to extract library versions from one file, so it is not needed to change x-files to just increase a version number (because this is far to easy to forget one of the files, which will not result in failures or is bad in general, but is inconsitent.) --- apt-pkg/init.h | 6 +++++- apt-pkg/makefile | 10 +++++----- buildlib/libversion.mak | 14 ++++++++++++++ debian/rules | 3 +-- methods/makefile | 5 ++--- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 buildlib/libversion.mak (limited to 'debian') diff --git a/apt-pkg/init.h b/apt-pkg/init.h index 44a57eb45..b3e4b147f 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -16,7 +16,11 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/pkgsystem.h> -// See the makefile +// These lines are extracted by the makefiles and the buildsystem +// Increasing MAJOR or MINOR results in the need of recompiling all +// reverse-dependencies of libapt-pkg against the new SONAME. +// Non-ABI-Breaks should only increase RELEASE number. +// See also buildlib/libversion.mak #define APT_PKG_MAJOR 4 #define APT_PKG_MINOR 9 #define APT_PKG_RELEASE 0 diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 80038e28e..f71367ace 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -9,13 +9,13 @@ HEADER_TARGETDIRS = apt-pkg # Bring in the default rules include ../buildlib/defaults.mak -# The library name, don't forget to update init.h and the copy in -# methods/makefile - FIXME +# The library name and version (indirectly used from init.h) +include ../buildlib/libversion.mak LIBRARY=apt-pkg -MAJOR=4.9 -MINOR=0 +MAJOR=$(LIBAPTPKG_MAJOR) +MINOR=$(LIBAPTPKG_RELEASE) SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -APT_DOMAIN:=libapt-pkg$(MAJOR) +APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR) # Source code for the contributed non-core things SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak new file mode 100644 index 000000000..796c956e7 --- /dev/null +++ b/buildlib/libversion.mak @@ -0,0 +1,14 @@ +# -*- make -*- +# Version number of libapt-pkg. +# Please increase MAJOR with each ABI break, +# with each non-ABI break to the lib, please increase RELEASE. +# The versionnumber is extracted from apt-pkg/init.h - see also there. +LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/init.h | sed 's/\.$$//') +LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/init.h | cut -d ' ' -f 3) + +# Version number of libapt-inst +# Please increase MAJOR with each ABI break, +# with each non-ABI break to the lib, please increase MINOR. +# The versionnumber is extracted from apt-inst/makefile - see also there. +LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) +LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) diff --git a/debian/rules b/debian/rules index d1b77e172..f69c0cffb 100755 --- a/debian/rules +++ b/debian/rules @@ -75,8 +75,7 @@ APT_UTILS=ftparchive sortpkgs extracttemplates #export DH_VERBOSE=1 # Find the libapt-pkg major version for use in other control files -export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2) -export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2) +include buildlib/libversion.mak # Determine which package we should provide in the control files LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) diff --git a/methods/makefile b/methods/makefile index f5d80d839..7bcae6b9b 100644 --- a/methods/makefile +++ b/methods/makefile @@ -6,9 +6,8 @@ SUBDIR=methods include ../buildlib/defaults.mak BIN := $(BIN)/methods -# FIXME.. -LIB_APT_PKG_MAJOR = 4.9 -APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) +include ../buildlib/libversion.mak +APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR) # The file method PROGRAM=file -- cgit v1.2.3-70-g09d2 From 4651a3e0ffe9662d620ee1cb5c5bdf60c075e59b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 28 Oct 2009 19:15:28 +0100 Subject: remove unneeded control field duplications as lintian suggests it --- debian/control | 4 ---- 1 file changed, 4 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a9c82f9e8..7eae1860c 100644 --- a/debian/control +++ b/debian/control @@ -12,11 +12,9 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring -Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. It provides the apt-get utility and APT dselect method that provides a @@ -55,10 +53,8 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) -Section: admin Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. -- cgit v1.2.3-70-g09d2 From 9e38dd7cd0b6a12da0345c6489852c98d35b363c Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 28 Oct 2009 22:11:28 +0100 Subject: German translation of manpages --- debian/changelog | 2 + doc/po/de.po | 9216 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 9218 insertions(+) create mode 100644 doc/po/de.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 57f0ddccf..2d9109ca4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #548571 * German translation update by Holger Wansing Closes: #551534 + * German translation of manpages by Chris Leick + Closes: #552606 [ Michael Vogt ] * apt-pkg/packagemanager.cc: diff --git a/doc/po/de.po b/doc/po/de.po new file mode 100644 index 000000000..edcfb25ea --- /dev/null +++ b/doc/po/de.po @@ -0,0 +1,9216 @@ +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: apt-doc 0.7.24\n" +"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" +"POT-Creation-Date: 2009-09-26 11:35+0300\n" +"PO-Revision-Date: 2009-10-25 15:11+GMT\n" +"Last-Translator: Chris Leick <c.leick@vollbio.de>\n" +"Language-Team: German <debian-l10n-german@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "apt" +msgstr "apt" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "16 June 1998" +msgstr "16. Juni 1998" + +#. type: TH +#: apt.8:17 +#, no-wrap +msgid "Debian GNU/Linux" +msgstr "Debian GNU/Linux" + +#. type: SH +#: apt.8:18 +#, no-wrap +msgid "NAME" +msgstr "NAME" + +#. type: Plain text +#: apt.8:20 +msgid "apt - Advanced Package Tool" +msgstr "apt - Fortschrittliches Paketierungswerkzeug (Advanced Package Tool)" + +#. type: SH +#: apt.8:20 +#, no-wrap +msgid "SYNOPSIS" +msgstr "??BERSICHT" + +#. type: Plain text +#: apt.8:22 +msgid "B<apt>" +msgstr "B<apt>" + +#. type: SH +#: apt.8:22 +#, no-wrap +msgid "DESCRIPTION" +msgstr "BESCHREIBUNG" + +#. type: Plain text +#: apt.8:31 +msgid "" +"APT is a management system for software packages. For normal day to day " +"package management there are several frontends available, such as B<aptitude>" +"(8) for the command line or B<synaptic>(8) for the X Window System. Some " +"options are only implemented in B<apt-get>(8) though." +msgstr "" +"APT ist ein Verwaltungssystem f??r Softwarepakete. F??r normale allt??gliche " +"Paketverwaltung sind mehrere Oberfl??chen, wie B<aptitude>(8) f??r die " +"Befehlszeile oder B<synaptic>(8) f??r das X-Window-System, verf??gbar. " +"Einige Optionen sind jedoch nur in B<apt-get>(8) implementiert." + +#. type: SH +#: apt.8:31 +#, no-wrap +msgid "OPTIONS" +msgstr "OPTIONEN" + +#. type: Plain text +#: apt.8:33 apt.8:35 +msgid "None." +msgstr "Keine" + +#. type: SH +#: apt.8:33 +#, no-wrap +msgid "FILES" +msgstr "DATEIEN" + +#. type: SH +#: apt.8:35 +#, no-wrap +msgid "SEE ALSO" +msgstr "SIEHE AUCH" + +#. type: Plain text +#: apt.8:42 +msgid "" +"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " +"B<apt_preferences>(5), B<apt-secure>(8)" +msgstr "" +"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " +"B<apt_preferences>(5), B<apt-secure>(8)" + +#. type: SH +#: apt.8:42 +#, no-wrap +msgid "DIAGNOSTICS" +msgstr "DIAGNOSE" + +#. type: Plain text +#: apt.8:44 +msgid "apt returns zero on normal operation, decimal 100 on error." +msgstr "apt gibt bei normalen Operationen 0 zur??ck, dezimal 100 bei Fehlern." + +#. type: SH +#: apt.8:44 +#, no-wrap +msgid "BUGS" +msgstr "FEHLER" + +#. type: Plain text +#: apt.8:46 +msgid "This manpage isn't even started." +msgstr "Diese Handbuchseite wurde noch nicht mal begonnen." + +#. type: Plain text +#: apt.8:55 +msgid "" +"See E<lt>http://bugs.debian.org/aptE<gt>. If you wish to report a bug in " +"B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the " +"B<reportbug>(1) command." +msgstr "" +"Siehe auch E<lt>http://bugs.debian.org/aptE<gt>. Wenn Sie einen Fehler in " +"B<apt> berichten m??chten, sehen Sie sich bitte I</usr/share/doc/debian/bug-" +"reporting.txt> oder den Befehl B<reportbug>(1) an." + +#. type: SH +#: apt.8:55 +#, no-wrap +msgid "AUTHOR" +msgstr "AUTOR" + +#. type: Plain text +#: apt.8:56 +msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>." +msgstr "apt wurde vom APT-Team E<lt>apt@packages.debian.orgE<gt> geschrieben." + +#. type: Plain text +#: apt.ent:2 +msgid "<!-- -*- mode: sgml; mode: fold -*- -->" +msgstr "<!-- -*- mode: sgml; mode: fold -*- -->" + +#. type: Plain text +#: apt.ent:10 +msgid "" +"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!" +"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex " +"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY " +"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" +"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" +msgstr "" +"<!-- Einige h??ufige Pfade ... --> <!ENTITY docdir \"/usr/share/doc/apt/\"> " +"<!ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex " +"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY " +"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" +"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" + +#. type: Plain text +#: apt.ent:17 +#, no-wrap +msgid "" +"<!-- Cross references to other man pages -->\n" +"<!ENTITY apt-conf \"<citerefentry>\n" +" <refentrytitle><filename>apt.conf</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!-- Querverweise auf andere Handbuchseiten -->\n" +"<!ENTITY apt-conf \"<citerefentry>\n" +" <refentrytitle><filename>apt.conf</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:23 +#, no-wrap +msgid "" +"<!ENTITY apt-get \"<citerefentry>\n" +" <refentrytitle><command>apt-get</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-get \"<citerefentry>\n" +" <refentrytitle><command>apt-get</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:29 +#, no-wrap +msgid "" +"<!ENTITY apt-config \"<citerefentry>\n" +" <refentrytitle><command>apt-config</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-config \"<citerefentry>\n" +" <refentrytitle><command>apt-config</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:35 +#, no-wrap +msgid "" +"<!ENTITY apt-cdrom \"<citerefentry>\n" +" <refentrytitle><command>apt-cdrom</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-cdrom \"<citerefentry>\n" +" <refentrytitle><command>apt-cdrom</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:41 +#, no-wrap +msgid "" +"<!ENTITY apt-cache \"<citerefentry>\n" +" <refentrytitle><command>apt-cache</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-cache \"<citerefentry>\n" +" <refentrytitle><command>apt-cache</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:47 +#, no-wrap +msgid "" +"<!ENTITY apt-preferences \"<citerefentry>\n" +" <refentrytitle><command>apt_preferences</command></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-preferences \"<citerefentry>\n" +" <refentrytitle><command>apt_preferences</command></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:53 +#, no-wrap +msgid "" +"<!ENTITY apt-key \"<citerefentry>\n" +" <refentrytitle><command>apt-key</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-key \"<citerefentry>\n" +" <refentrytitle><command>apt-key</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:59 +#, no-wrap +msgid "" +"<!ENTITY apt-secure \"<citerefentry>\n" +" <refentrytitle>apt-secure</refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-secure \"<citerefentry>\n" +" <refentrytitle>apt-secure</refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:65 +#, no-wrap +msgid "" +"<!ENTITY apt-ftparchive \"<citerefentry>\n" +" <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY apt-ftparchive \"<citerefentry>\n" +" <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:72 +#, no-wrap +msgid "" +"<!ENTITY sources-list \"<citerefentry>\n" +" <refentrytitle><filename>sources.list</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY sources-list \"<citerefentry>\n" +" <refentrytitle><filename>sources.list</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:78 +#, no-wrap +msgid "" +"<!ENTITY reportbug \"<citerefentry>\n" +" <refentrytitle><command>reportbug</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY reportbug \"<citerefentry>\n" +" <refentrytitle><command>reportbug</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:84 +#, no-wrap +msgid "" +"<!ENTITY dpkg \"<citerefentry>\n" +" <refentrytitle><command>dpkg</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY dpkg \"<citerefentry>\n" +" <refentrytitle><command>dpkg</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:90 +#, no-wrap +msgid "" +"<!ENTITY dpkg-buildpackage \"<citerefentry>\n" +" <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY dpkg-buildpackage \"<citerefentry>\n" +" <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:96 +#, no-wrap +msgid "" +"<!ENTITY gzip \"<citerefentry>\n" +" <refentrytitle><command>gzip</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY gzip \"<citerefentry>\n" +" <refentrytitle><command>gzip</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:102 +#, no-wrap +msgid "" +"<!ENTITY dpkg-scanpackages \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY dpkg-scanpackages \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:108 +#, no-wrap +msgid "" +"<!ENTITY dpkg-scansources \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY dpkg-scansources \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:114 +#, no-wrap +msgid "" +"<!ENTITY dselect \"<citerefentry>\n" +" <refentrytitle><command>dselect</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY dselect \"<citerefentry>\n" +" <refentrytitle><command>dselect</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:120 +#, no-wrap +msgid "" +"<!ENTITY aptitude \"<citerefentry>\n" +" <refentrytitle><command>aptitude</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY aptitude \"<citerefentry>\n" +" <refentrytitle><command>aptitude</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:126 +#, no-wrap +msgid "" +"<!ENTITY synaptic \"<citerefentry>\n" +" <refentrytitle><command>synaptic</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY synaptic \"<citerefentry>\n" +" <refentrytitle><command>synaptic</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:132 +#, no-wrap +msgid "" +"<!ENTITY debsign \"<citerefentry>\n" +" <refentrytitle><command>debsign</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY debsign \"<citerefentry>\n" +" <refentrytitle><command>debsign</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:138 +#, no-wrap +msgid "" +"<!ENTITY debsig-verify \"<citerefentry>\n" +" <refentrytitle><command>debsig-verify</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY debsig-verify \"<citerefentry>\n" +" <refentrytitle><command>debsig-verify</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:144 +#, no-wrap +msgid "" +"<!ENTITY gpg \"<citerefentry>\n" +" <refentrytitle><command>gpg</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY gpg \"<citerefentry>\n" +" <refentrytitle><command>gpg</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:150 +#, no-wrap +msgid "" +"<!ENTITY gnome-apt \"<citerefentry>\n" +" <refentrytitle><command>gnome-apt</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY gnome-apt \"<citerefentry>\n" +" <refentrytitle><command>gnome-apt</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:156 +#, no-wrap +msgid "" +"<!ENTITY wajig \"<citerefentry>\n" +" <refentrytitle><command>wajig</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" +msgstr "" +"<!ENTITY wajig \"<citerefentry>\n" +" <refentrytitle><command>wajig</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" + +#. type: Plain text +#: apt.ent:168 +#, no-wrap +msgid "" +"<!-- Boiler plate docinfo section -->\n" +"<!ENTITY apt-docinfo \"\n" +" <refentryinfo>\n" +" <address><email>apt@packages.debian.org</email></address>\n" +" <author>\n" +" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" +" <date>28 October 2008</date>\n" +" <productname>Linux</productname>\n" +msgstr "" +"<!-- Vorformatierter Textblock docinfo-Abschnitt -->\n" +"<!ENTITY apt-docinfo \"\n" +" <refentryinfo>\n" +" <address><email>apt@packages.debian.org</email></address>\n" +" <author>\n" +" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" +" <date>28. Oktober 2008</date>\n" +" <productname>Linux</productname>\n" + +#. type: Plain text +#: apt.ent:171 +#, no-wrap +msgid "" +" </refentryinfo>\n" +"\"> \n" +msgstr "" +" </refentryinfo>\n" +"\"> \n" + +#. type: Plain text +#: apt.ent:177 +#, no-wrap +msgid "" +"<!ENTITY apt-email \"\n" +" <address>\n" +" <email>apt@packages.debian.org</email>\n" +" </address>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-email \"\n" +" <address>\n" +" <email>apt@packages.debian.org</email>\n" +" </address>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:185 +#, no-wrap +msgid "" +"<!ENTITY apt-author.jgunthorpe \"\n" +" <author>\n" +" <firstname>Jason</firstname>\n" +" <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-author.jgunthorpe \"\n" +" <author>\n" +" <firstname>Jason</firstname>\n" +" <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:193 +#, no-wrap +msgid "" +"<!ENTITY apt-author.moconnor \"\n" +" <author>\n" +" <firstname>Mike</firstname>\n" +" <surname>O'Connor</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-author.moconnor \"\n" +" <author>\n" +" <firstname>Mike</firstname>\n" +" <surname>O'Connor</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:200 +#, no-wrap +msgid "" +"<!ENTITY apt-author.team \"\n" +" <author>\n" +" <othername>APT team</othername>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-author.team \"\n" +" <author>\n" +" <othername>APT-Team</othername>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:204 apt.ent:215 +#, no-wrap +msgid "" +"<!ENTITY apt-product \"\n" +" <productname>Linux</productname>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-product \"\n" +" <productname>Linux</productname>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:211 +#, no-wrap +msgid "" +"<!ENTITY apt-copyright \"\n" +" <copyright>\n" +" <holder>Jason Gunthorpe</holder>\n" +" <year>1998-2001</year>\n" +" </copyright>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-copyright \"\n" +" <copyright>\n" +" <holder>Jason Gunthorpe</holder>\n" +" <year>1998-2001</year>\n" +" </copyright>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:221 +#, no-wrap +msgid "" +"<!ENTITY apt-qapage \"\n" +"\t<para>\n" +"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>\n" +"\t</para>\n" +"\">\n" +msgstr "" +"<!ENTITY apt-qapage \"\n" +"\t<para>\n" +"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>QA-Seite</ulink>\n" +"\t</para>\n" +"\">\n" + +#. type: Plain text +#: apt.ent:232 +#, no-wrap +msgid "" +"<!-- Boiler plate Bug reporting section -->\n" +"<!ENTITY manbugs \"\n" +" <refsect1><title>Bugs\n" +" APT bug page. \n" +" If you wish to report a bug in APT, please see\n" +" /usr/share/doc/debian/bug-reporting.txt or the\n" +" &reportbug; command.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Fehler\n" +" APT-Fehlerseite. \n" +" Wenn Sie einen Fehler in APT berichten m??chten, lesen Sie bitte\n" +" /usr/share/doc/debian/bug-reporting.txt oder den\n" +" &reportbug;-Befehl. Verfassen Sie Fehlerberichte bitte auf Englisch.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:240 +#, no-wrap +msgid "" +"\n" +"Author\n" +" APT was written by the APT team apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" +msgstr "" +"\n" +"Autor\n" +" APT wurde vom APT-Team geschrieben apt@packages.debian.org.\n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:250 +#, no-wrap +msgid "" +"\n" +"\n" +" \n" +" Show a short usage summary.\n" +" \n" +" \n" +" \n" +msgstr "" +"\n" +"\n" +" \n" +" Ein kurze Aufrufzusammenfassung zeigen.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:258 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Show the program version.\n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Die Version des Programms anzeigen.\n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:268 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Configuration File; Specify a configuration file to use. \n" +" The program will read the default configuration file and then this \n" +" configuration file. See &apt-conf; for syntax information. \n" +" \n" +" \n" +" \n" +msgstr "" +" \n" +" \n" +" \n" +" Konfigurationsdatei; Gibt eine Konfigurationssdatei zum Benutzen an.\n" +" Das Programm wird die Vorgabe-Konfigurationsdatei und dann diese\n" +" Konfigurationsdatei lesen. Lesen Sie &apt-conf;, um Syntax-Informationen zu erhalten \n" +" \n" +" \n" +" \n" + +#. type: Plain text +#: apt.ent:280 +#, no-wrap +msgid "" +" \n" +" \n" +" \n" +" Set a Configuration Option; This will set an arbitrary\n" +" configuration option. The syntax is .\n" +" and can be used multiple\n" +" times to set different options.\n" +" \n" +" \n" +" \n" +"\">\n" +msgstr "" +" \n" +" \n" +" \n" +" Eine Konfigurationsoption setzen; Dies wird eine beliebige\n" +" Konfigurationsoption setzen. Die Syntax lautet .\n" +" und kann mehrfach benutzt\n" +" werden, um verschiedene Optionen zu setzen.\n" +" \n" +" \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:291 +#, no-wrap +msgid "" +"\n" +"All command line options may be set using the configuration file, the\n" +" descriptions indicate the configuration option to set. For boolean\n" +" options you can override the config file by using something like \n" +" ,, \n" +" or several other variations.\n" +" \n" +"\">\n" +msgstr "" +"\n" +"Alle Befehlszeilenoptionen k??nnen durch die Konfigurationsdatei gesetzt\n" +" werden, die Beschreibung gibt die zu setzende Option an. F??r\n" +" boolesche Optionen k??nnen Sie die Konfigurationsdatei ??berschreiben,\n" +" indem Sie etwas wie , ,\n" +" oder etliche weitere Varianten benutzen.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:297 +#, no-wrap +msgid "" +"/etc/apt/apt.conf\n" +" APT configuration file.\n" +" Configuration Item: Dir::Etc::Main.\n" +" \n" +msgstr "" +"/etc/apt/apt.conf\n" +" APT-Konfigurationsdatei.\n" +" Konfigurationselement: Dir::Etc::Main.\n" +" \n" + +#. type: Plain text +#: apt.ent:303 +#, no-wrap +msgid "" +" /etc/apt/apt.conf.d/\n" +" APT configuration file fragments.\n" +" Configuration Item: Dir::Etc::Parts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/apt.conf.d/\n" +" APT-Konfigurationsdatei-Fragmente.\n" +" Konfigurationselement: Dir::Etc::Parts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:309 +#, no-wrap +msgid "" +"&cachedir;/archives/\n" +" Storage area for retrieved package files.\n" +" Configuration Item: Dir::Cache::Archives.\n" +" \n" +msgstr "" +"&cachedir;/archives/\n" +" Speicherbereich f??r aufgerufene Paketdateien.\n" +" Konfigurationselement: Dir::Cache::Archives.\n" +" \n" + +#. type: Plain text +#: apt.ent:315 +#, no-wrap +msgid "" +" &cachedir;/archives/partial/\n" +" Storage area for package files in transit.\n" +" Configuration Item: Dir::Cache::Archives (implicit partial). \n" +" \n" +"\">\n" +msgstr "" +" &cachedir;/archives/partial/\n" +" Speicherbereich f??r Paketdateien auf dem Transportweg.\n" +" Konfigurationselement: Dir::Cache::Archives (implizit teilweise). \n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:325 +#, no-wrap +msgid "" +"/etc/apt/preferences\n" +" Version preferences file.\n" +" This is where you would specify "pinning",\n" +" i.e. a preference to get certain packages\n" +" from a separate source\n" +" or from a different version of a distribution.\n" +" Configuration Item: Dir::Etc::Preferences.\n" +" \n" +msgstr "" +"/etc/apt/preferences\n" +" Version-Einstellungsdatei.\n" +" Hier k??nnen Sie "pinning" angeben, d.h. eine Einstellung,\n" +" um bestimmte Pakete aus einer separaten Quelle oder von einer\n" +" anderen Version einer Distribution zu erhalten.\n" +" Konfigurationselement: Dir::Etc::Preferences.\n" +" \n" + +#. type: Plain text +#: apt.ent:331 +#, no-wrap +msgid "" +" /etc/apt/preferences.d/\n" +" File fragments for the version preferences.\n" +" Configuration Item: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/preferences.d/\n" +" Dateifragmente f??r die Versionseinstellungen.\n" +" Konfigurationselement: Dir::Etc::PreferencesParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:337 +#, no-wrap +msgid "" +"/etc/apt/sources.list\n" +" Locations to fetch packages from.\n" +" Configuration Item: Dir::Etc::SourceList.\n" +" \n" +msgstr "" +"/etc/apt/sources.list\n" +" Orte, von denen Pakete geladen werden.\n" +" Konfigurationselement: Dir::Etc::SourceList.\n" +" \n" + +#. type: Plain text +#: apt.ent:343 +#, no-wrap +msgid "" +" /etc/apt/sources.list.d/\n" +" File fragments for locations to fetch packages from.\n" +" Configuration Item: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" +msgstr "" +" /etc/apt/sources.list.d/\n" +" Dateifragmente f??r Orte, von denen Pakete geladen werden.\n" +" Konfigurationselement: Dir::Etc::SourceParts.\n" +" \n" +"\">\n" + +#. type: Plain text +#: apt.ent:350 +#, no-wrap +msgid "" +"&statedir;/lists/\n" +" Storage area for state information for each package resource specified in\n" +" &sources-list;\n" +" Configuration Item: Dir::State::Lists.\n" +" \n" +msgstr "" +"&statedir;/lists/\n" +" Speicherbereich f??r Statusinformationen jeder\n" +" in &sources-list; angegebenen Paketquelle\n" +" Konfigurationselement: Dir::State::Lists.\n" +" \n" + +#. type: Plain text +#: apt.ent:355 +#, no-wrap +msgid "" +" &statedir;/lists/partial/\n" +" Storage area for state information in transit.\n" +" Configuration Item: Dir::State::Lists (implicit partial).\n" +" \n" +"\">\n" +msgstr "" +" &statedir;/lists/partial/\n" +" Speicherbereich f??r Statusinformationen auf dem Transportweg.\n" +" Konfigurationselement: Dir::State::Lists (implizit teilweise).\n" +" \n" +"\">\n" + +#. The last update date +#. type: Content of: +#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 +#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; 29 " +"February 2004" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " +"29. Februar 2004" + +#. type: Content of: +#: apt-cache.8.xml:22 apt-cache.8.xml:29 +msgid "apt-cache" +msgstr "apt-cache" + +#. type: Content of: +#: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 +#: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 +msgid "8" +msgstr "8" + +#. type: Content of: +#: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 +#: apt-extracttemplates.1.xml:24 apt-ftparchive.1.xml:24 apt-get.8.xml:24 +#: apt-key.8.xml:16 apt-mark.8.xml:24 apt-secure.8.xml:16 +#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 +#: sources.list.5.xml:24 +msgid "APT" +msgstr "APT" + +#. type: Content of: +#: apt-cache.8.xml:30 +msgid "APT package handling utility -- cache manipulator" +msgstr "" +"APT-Werkzeug zur Handhabung von Paketen -- Zwischenspeichermanipulierer" + +#. type: Content of: +#: apt-cache.8.xml:36 +msgid "" +"apt-cache " +"add file gencaches showpkg pkg " +"showsrc pkg stats dump dumpavail unmet search regex show pkg depends pkg " +"rdepends pkg pkgnames prefix dotty pkg " +"xvcg pkg policy pkgs madison pkgs " +msgstr "" +"apt-cache " +" add Datei gencaches " +"showpkg pkg showsrc pkg stats dump dumpavail unmet search regex show pkg depends " +"pkg rdepends Paket pkgnames Pr??fix dotty Paket " +"xvcg Paket policy Pakete madison Pakete " + +#. type: Content of: +#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-key.8.xml:34 apt-mark.8.xml:52 apt-secure.8.xml:40 +#: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 +#: sources.list.5.xml:33 +msgid "Description" +msgstr "Beschreibung" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:63 +msgid "" +"<command>apt-cache</command> performs a variety of operations on APT's " +"package cache. <command>apt-cache</command> does not manipulate the state of " +"the system but does provide operations to search and generate interesting " +"output from the package metadata." +msgstr "" +"<command>apt-cache</command> f??hrt eine Vielzahl von Operationen auf dem " +"Paketzwischenspeicher von APT durch. <command>apt-cache</command> " +"manipuliert nicht den Status des Systems, stellt aber Operationen zum Suchen " +"und Generieren von interessanten Ausgaben der Paket-Metadaten bereit." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:68 apt-get.8.xml:131 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given, " +"one of the commands below must be present." +msgstr "" +"Sofern nicht die <option>-h</option>-, oder <option>--help</option>-Option " +"angegeben ist, muss einer der unten aufgef??hrten Befehle vorkommen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:72 +msgid "add <replaceable>file(s)</replaceable>" +msgstr "add <replaceable>Datei(en)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:73 +msgid "" +"<literal>add</literal> adds the named package index files to the package " +"cache. This is for debugging only." +msgstr "" +"<literal>add</literal> f??gt die genannten Paket-Index-Dateien zum " +"Paketzwischenspeicher hinzu. Dies dient nur der Fehlersuche." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:77 +msgid "gencaches" +msgstr "gencaches" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:78 +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>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:84 +msgid "showpkg <replaceable>pkg(s)</replaceable>" +msgstr "showpkg <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:85 +msgid "" +"<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 well " +"as forward dependencies for each version. Forward (normal) dependencies are " +"those packages upon which the package in question depends; reverse " +"dependencies are those packages that depend upon the package in question. " +"Thus, forward dependencies must be satisfied for a package, but reverse " +"dependencies need not be. For instance, <command>apt-cache showpkg " +"libreadline2</command> would produce output similar to the following:" +msgstr "" +"<literal>showpkg</literal> zeigt Informationen ??ber die auf der " +"Befehlszeile aufgelisteten Pakete. Die ??brigen Argumente sind Paketnamen. " +"Die verf??gbaren Versionen und R??ckw??rtsabh??ngigkeiten jedes aufgef??" +"hrten Paketes werden ebenso aufgelistet, wie die Vorw??rtsabh??ngigkeiten " +"jeder Version. Vorw??rtsabh??ngigkeiten (normale Abh??ngigkeiten) sind jene " +"Pakete, von denen das betreffende Paket abh??ngt. R??ckw??rtsabh??ngigkeiten " +"sind jene Pakete, die von dem betreffenden Paket abh??ngen. Deshalb m??ssen " +"Vorw??rtsabh??ngigkeiten f??r das Paket erf??llt werden, R??ckw??rtsabh??" +"ngigkeiten allerdings nicht. <command>apt-cache showpkg libreadline2</" +"command> w??rde zum Beispiel eine Ausgabe ??hnlich der folgenden erzeugen:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-cache.8.xml:97 +#, no-wrap +msgid "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" +msgstr "" +"Package: libreadline2\n" +"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Reverse Depends: \n" +" libreadlineg2,libreadline2\n" +" libreadline2-altdev,libreadline2\n" +"Dependencies:\n" +"2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" +"Provides:\n" +"2.1-12 - \n" +"Reverse Provides: \n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:109 +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, " +"libreadlineg2 and libreadline2-altdev depend on libreadline2. If " +"libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be " +"installed; libreadlineg2 and libreadline2-altdev do not have to be " +"installed. For the specific meaning of the remainder of the output it is " +"best to consult the apt source code." +msgstr "" +"Dadurch sieht man, dass libreadline2, Version 2.1-12, von libc5 und " +"ncurses3.0 abh??ngt, die installiert sein m??ssen, damit libreadline2 " +"funktioniert. Im Gegenzug h??ngen libreadlineg2 und libreadline2-altdev von " +"libreadline2 ab. Wenn libreadline2 installiert ist, m??ssen au??erdem libc5 " +"und ncurses3.0 (und ldso) installiert sein. F??r die spezielle Bedeutung der " +"restlichen Ausgabe ist es am besten, den apt-Quelltext zu konsultieren." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:118 +msgid "stats" +msgstr "stats" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:118 +msgid "" +"<literal>stats</literal> displays some statistics about the cache. No " +"further arguments are expected. Statistics reported are:" +msgstr "" +"<literal>stats</literal> zeigt einige Statistiken ??ber den " +"Zwischenspeicher. 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:121 +msgid "" +"<literal>Total package names</literal> is the number of package names found " +"in the cache." +msgstr "" +"<literal>Total package names</literal> ist die Gesamtzahl der im " +"Zwischenspeicher gefundenen Pakete." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:125 +msgid "" +"<literal>Normal packages</literal> is the number of regular, ordinary " +"package names; these are packages that bear a one-to-one correspondence " +"between their names and the names used by other packages for them in " +"dependencies. The majority of packages fall into this category." +msgstr "" +"<literal>Normal packages</literal> ist die Anzahl der regul??ren, gew??" +"hnlichen Paketnamen. Diese sind Pakete, die eine Eins-zu-Eins-Entsprechung " +"zwischen ihren Namen und den Namen, die andere Pakete f??r ihre Abh??" +"ngigkeiten benutzen, tragen. Die Mehrzahl der Pakete f??llt in diese " +"Kategorie." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:131 +msgid "" +"<literal>Pure virtual packages</literal> is the number of packages that " +"exist only as a virtual package name; that is, packages only \"provide\" the " +"virtual package name, and no package actually uses the name. For instance, " +"\"mail-transport-agent\" in the Debian GNU/Linux system is a pure virtual " +"package; several packages provide \"mail-transport-agent\", but there is no " +"package named \"mail-transport-agent\"." +msgstr "" +"<literal>Pure virtual packages</literal> ist die Anzahl der Pakete, die nur " +"als ein virtueller Paketname existieren. Das kommt vor, wenn Pakete nur den " +"virtuellen Paketnamen ??bereitstellen?? und aktuell kein Paket den Namen " +"benutzt. Zum Beispiel ist im Debian-GNU/Linux-System ??mail-transport-" +"agent?? ein rein virtuelles Paket. Mehrere Pakete stellen ??mail-transport-" +"agent?? 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:139 +msgid "" +"<literal>Single virtual packages</literal> is the number of packages with " +"only one package providing a particular virtual package. For example, in the " +"Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " +"one package, xless, provides \"X11-text-viewer\"." +msgstr "" +"<literal>Single virtual packages</literal> ist die Anzahl der Pakete mit nur " +"einem Paket, das ein bestimmtes virtuelles Paket bereitstellt. ??X11-text-" +"viewer?? ist zum Beispiel im Debian-GNU/Linux-System ein virtuelles Paket, " +"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:145 +msgid "" +"<literal>Mixed virtual packages</literal> is the number of packages that " +"either provide a particular virtual package or have the virtual package name " +"as the package name. For instance, in the Debian GNU/Linux system, \"debconf" +"\" is both an actual package, and provided by the debconf-tiny package." +msgstr "" +"<literal>Mixed virtual packages</literal> ist die Anzahl der Pakete, die " +"entweder ein bestimmtes virtuelles Paket bereitstellen oder den virtuellen " +"Paketnamen als Paketnamen haben. ??debconf?? ist zum Beispiel sowohl ein " +"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:152 +msgid "" +"<literal>Missing</literal> is the number of package names that were " +"referenced in a dependency but were not provided by any package. Missing " +"packages may be in evidence if a full distribution is not accessed, or if a " +"package (real or virtual) has been dropped from the distribution. Usually " +"they are referenced from Conflicts or Breaks statements." +msgstr "" +"<literal>Missing</literal> ist die Anzahl der Paketnamen, auf die eine Abh??" +"ngigkeit verweist, die aber von keinem Paket bereitgestellt werden. Fehlende " +"Pakete k??nnten auftauchen, wenn nicht auf eine vollst??ndige Distribution " +"zugegriffen oder ein (echtes oder virtuelles) Paket aus einer Distribution " +"gestrichen wurde. Normalerweise wird auf sie von Conflicts oder Breaks-" +"Angaben Bezug genommen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:159 +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 " +"total package names. If more than one distribution (both \"stable\" and " +"\"unstable\", for instance), is being accessed, this value can be " +"considerably larger than the number of total package names." +msgstr "" +"<literal>Total distinct</literal> Versionen ist die Anzahl der im " +"Zwischenspeicher gefundenen Paketversionen. Dieser Wert ist daher meistens " +"gleich der Anzahl der gesamten Paketnamen. Wenn auf mehr als eine " +"Distribution (zum Beispiel ??stable?? und ??unstable?? zusammen) zugegriffen " +"wird, kann dieser Wert deutlich gr????er als die gesamte Anzahl der " +"Paketnamen sein." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> +#: apt-cache.8.xml:166 +msgid "" +"<literal>Total dependencies</literal> is the number of dependency " +"relationships claimed by all of the packages in the cache." +msgstr "" +"<literal>Total dependencies</literal> ist die Anzahl der Abh??" +"ngigkeitsbeziehungen, den alle Pakete im Zwischenspeicher beanspruchen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:173 +msgid "showsrc <replaceable>pkg(s)</replaceable>" +msgstr "showsrc <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:174 +msgid "" +"<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." +msgstr "" +"<literal>showsrc</literal> zeigt alle Quellpaketdatens??tze, die den " +"angegebenen Paketnamen entsprechen. Alle Versionen werden ebenso angezeigt, " +"wie alle Datens??tze, die den Namen f??r ein Programm deklarieren." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:179 apt-config.8.xml:84 +msgid "dump" +msgstr "dump" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:180 +msgid "" +"<literal>dump</literal> shows a short listing of every package in the cache. " +"It is primarily for debugging." +msgstr "" +"<literal>dump</literal> zeigt einen kurzen Programmausdruck von jedem Paket " +"im Zwischenspeicher. Es dient in erster Linie der Fehlersuche." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:184 +msgid "dumpavail" +msgstr "dumpavail" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:185 +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 "" +"<literal>dumpavail</literal> gibt eine verf??gbare Liste auf stdout aus. " +"Dies ist geeignet f??r die Benutzung mit &dpkg; und wird f??r die &dselect;-" +"Methode benutzt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:189 +msgid "unmet" +msgstr "unmet" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:190 +msgid "" +"<literal>unmet</literal> displays a summary of all unmet dependencies in the " +"package cache." +msgstr "" +"<literal>unmet</literal> zeigt die Zusammenfassung aller unerf??llten Abh??" +"ngigkeiten im Paketzwischenspeicher." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:194 +msgid "show <replaceable>pkg(s)</replaceable>" +msgstr "show <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:195 +msgid "" +"<literal>show</literal> performs a function similar to <command>dpkg --print-" +"avail</command>; it displays the package records for the named packages." +msgstr "" +"<literal>show</literal> f??hrt eine Funktion aus, die <command>dpkg --print-" +"avail</command> ??hnlich ist. Es zeigt die Paketdatens??tze f??r die " +"genannten Pakete." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:200 +msgid "search <replaceable>regex [ regex ... ]</replaceable>" +msgstr "search <replaceable>regex [ regex ... ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:201 +msgid "" +"<literal>search</literal> performs a full text search on all available " +"package lists for the POSIX regex pattern given, see " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. It searches the package names and " +"the descriptions for an occurrence of the regular expression and prints out " +"the package name and the short description, including virtual package " +"names. If <option>--full</option> is given then output identical to " +"<literal>show</literal> is produced for each matched package, and if " +"<option>--names-only</option> is given then the long description is not " +"searched, only the package name is." +msgstr "" +"<literal>search</literal> f??hrt eine Volltextsuche in der Liste aller verf??" +"gbaren Pakete f??r das gegebene POSIX-regex-Muster durch, siehe " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. Es durchsucht die Paketnamen und " +"die Beschreibungen nach einem Vorkommen des regul??ren Ausdrucks und gibt " +"den Paketnamen mit einer kurzen Beschreibung, einschlie??lich virtueller " +"Paketnamen, aus. Wenn <option>--full</option> angegeben wurde, ist die " +"Ausgabe gleich der, die <literal>show</literal> f??r jedes Paket erzeugt und " +"wenn <option>--names-only</option> angegeben wurde, wird die lange " +"Beschreibung nicht durchsucht, sondern nur der Paketname." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:214 +msgid "" +"Separate arguments can be used to specify multiple search patterns that are " +"and'ed together." +msgstr "" +"Separate Argumente k??nnen benutzt werden, um mehrere Suchmuster anzugeben, " +"die ??und??-verkn??pft werden." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:218 +msgid "depends <replaceable>pkg(s)</replaceable>" +msgstr "depends <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:219 +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 "" +"<literal>depends</literal> zeigt eine Liste von jeder Abh??ngigkeit, die ein " +"Paket hat und alle m??glichen anderen Pakete, die die Abh??ngigkeit erf??" +"llen k??nnen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:223 +msgid "rdepends <replaceable>pkg(s)</replaceable>" +msgstr "rdepends <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:224 +msgid "" +"<literal>rdepends</literal> shows a listing of each reverse dependency a " +"package has." +msgstr "" +"<literal>rdepends</literal> zeigt eine Liste von jeder R??ckw??rtsabh??" +"ngigkeit, die ein Paket hat." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:228 +msgid "pkgnames <replaceable>[ prefix ]</replaceable>" +msgstr "pkgnames <replaceable>[ Pr??fix ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:229 +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 " +"for use in a shell tab complete function and the output is generated " +"extremely quickly. This command is best used with the <option>--generate</" +"option> option." +msgstr "" +"Dieser Befehl gibt den Namen jedes Paketes aus, das APT kennt. Das optionale " +"Argument ist ein passendes Pr??fix, um die Namensliste zu filtern. Die " +"Ausgabe ist geeignet f??r die Benutzung in der Tabulatorvervollst??ndigung " +"in der Shell. Die Ausgabe wird extrem schnell generiert. Dieser Befehl wird " +"am besten mit der <option>--generate</option>-Option benutzt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:234 +msgid "" +"Note that a package which APT knows of is not nessasarily available to " +"download, installable or installed, e.g. virtual packages are also listed in " +"the generated list." +msgstr "" +"Beachten Sie, dass ein Paket, das APT kennt, nicht notwendigerweise zum " +"Herunterladen verf??gbar, installierbar oder installiert ist, virtuelle " +"Pakete sind z.B. auch in der generierten Liste aufgef??hrt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:239 +msgid "dotty <replaceable>pkg(s)</replaceable>" +msgstr "dotty <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:240 +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." +"research.att.com/sw/tools/graphviz/\">GraphViz</ulink> package. The result " +"will be a set of nodes and edges representing the relationships between the " +"packages. By default the given packages will trace out all dependent " +"packages; this can produce a very large graph. To limit the output to only " +"the packages listed on the command line, set the <literal>APT::Cache::" +"GivenOnly</literal> option." +msgstr "" +"<literal>dotty</literal> nimmt eine Paketliste auf der Befehlszeile entgegen " +"und generiert eine Ausgabe, die f??r die Benutzung durch dotty aus dem Paket " +"<ulink url=\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</" +"ulink> geeignet ist. Das Ergebnis ist eine Zusammenstellung von Knoten und " +"Kanten, die die Beziehung zwischen Paketen darstellen. Standardm????ig " +"werden alle abh??ngigen Pakete ausfindig gemacht. Dies kann zu einem sehr " +"gro??en Schaubild f??hren. Um die Ausgabe auf die Pakete zu beschr??nken, " +"die auf der Befehlszeile eingegeben wurden, setzen Sie die Option " +"<literal>APT::Cache::GivenOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:249 +msgid "" +"The resulting nodes will have several shapes; normal packages are boxes, " +"pure provides are triangles, mixed provides are diamonds, missing packages " +"are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " +"lines are pre-depends, green lines are conflicts." +msgstr "" +"Die resultierenden Knoten haben mehrere Formen. Normale Pakete sind K??" +"stchen, reine Bereitstellungen sind Dreiecke, gemischte Bereitstellungen " +"sind Diamanten, fehlende Pakete sind Sechsecke. Orange K??stchen bedeuten, " +"dass die Rekursion beendet wurde [Blattpakete], blaue Linien sind Pre-" +"depends, gr??ne Linien sind Konflikte." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:254 +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:257 +msgid "xvcg <replaceable>pkg(s)</replaceable>" +msgstr "xvcg <replaceable>Paket(e)</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:258 +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 "" +"Das gleiche wie <literal>dotty</literal>, nur f??r xvcg vom <ulink url=" +"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG-Werkzeug</" +"ulink>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:262 +msgid "policy <replaceable>[ pkg(s) ]</replaceable>" +msgstr "policy <replaceable>[ Paket(e) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:263 +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 " +"source. Otherwise it prints out detailed information about the priority " +"selection of the named package." +msgstr "" +"<literal>policy</literal> ist dazu gedacht, bei Fragen der Fehlersuche, die " +"sich auf die Einstellungsdatei beziehen, zu helfen. Ohne Argumente gibt es " +"die Priorit??ten von jeder Quelle aus. Ansonsten gibt es umfangreiche " +"Informationen ??ber die Priorit??tenauswahl der genannten Pakete aus." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:269 +msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" +msgstr "madison <replaceable>/[ Paket(e) ]</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:270 +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 " +"archive management tool, <literal>madison</literal>. It displays available " +"versions of a package in a tabular format. Unlike the original " +"<literal>madison</literal>, it can only display information for the " +"architecture for which APT has retrieved package lists (<literal>APT::" +"Architecture</literal>)." +msgstr "" +"<literal>apt-cache</literal>s <literal>madison</literal>-Befehl versucht das " +"Ausgabeformat und eine Untermenge der Funktionalit??t des Debian-" +"Archivververwaltungswerkzeuges <literal>madison</literal> nachzuahmen. Es " +"zeigt verf??gbare Versionen eines Pakets in Tabellenform. Anders als das " +"Original <literal>madison</literal>, kann es nur Informationen f??r die " +"Architektur anzeigen, f??r die APT Paketlisten heruntergeladen hat " +"(<literal>APT::Architecture</literal>)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 +#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458 +msgid "options" +msgstr "Optionen" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:285 +msgid "<option>-p</option>" +msgstr "<option>-p</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:285 +msgid "<option>--pkg-cache</option>" +msgstr "<option>--pkg-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:286 +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::" +"pkgcache</literal>." +msgstr "" +"W??hlt die Datei zum Speichern des Paketzwischenspeichers. Der " +"Paketzwischenspeicher ist der prim??re Zwischenspeicher, der von allen " +"Operationen benutzt wird. Konfigurationselement: <literal>Dir::Cache::" +"pkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-sortpkgs.1.xml:58 +msgid "<option>-s</option>" +msgstr "<option>-s</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:291 +msgid "<option>--src-cache</option>" +msgstr "<option>--src-cache</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:292 +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 " +"information from remote sources. When building the package cache the source " +"cache is used to avoid reparsing all of the package files. Configuration " +"Item: <literal>Dir::Cache::srcpkgcache</literal>." +msgstr "" +"W??hlt die Datei zum Speichern des Quellenzwischenspeichers. Die Quelle wird " +"nur von <literal>gencaches</literal> benutzt und sie speichert eine " +"ausgewertete Version der Paketinformationen von entfernt liegenden Quellen. " +"Wenn der Paketzwischenspeicher gebildet wird, wird der " +"Quellenzwischenspeicher benutzt, um ein erneutes Auswerten aller " +"Paketdateien zu vermeiden. Konfigurationselement: <literal>Dir::Cache::" +"srcpkgcache</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +msgid "<option>-q</option>" +msgstr "<option>-q</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +msgid "<option>--quiet</option>" +msgstr "<option>--quiet</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:300 +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 " +"<option>-q=#</option> to set the quietness level, overriding the " +"configuration file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Still; erzeugt eine Ausgabe, die f??r Protokollierung geeignet ist und " +"Fortschrittsanzeiger wegl??sst. Mehr ??q??s unterdr??cken mehr Ausgaben, bis " +"zu einem Maximum von 2. Sie k??nnen au??erdem <option>-q=#</option> " +"benutzen, um die Stillestufe zu setzen, was die Konfigurationsdatei ??" +"berschreibt. Konfigurationselement: <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:306 +msgid "<option>-i</option>" +msgstr "<option>-i</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:306 +msgid "<option>--important</option>" +msgstr "<option>--important</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:307 +msgid "" +"Print only important dependencies; for use with unmet and depends. Causes " +"only Depends and Pre-Depends relations to be printed. Configuration Item: " +"<literal>APT::Cache::Important</literal>." +msgstr "" +"Nur wichtige Abh??ngigkeiten ausgeben. Zur Benutzung mit unmet und depends. " +"Veranlasst, dass nur Depends- und Pre-Depends-Beziehungen ausgegeben werden. " +"Konfigurationselement: <literal>APT::Cache::Important</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 +msgid "<option>-f</option>" +msgstr "<option>-f</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:312 +msgid "<option>--full</option>" +msgstr "<option>--full</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:313 +msgid "" +"Print full package records when searching. Configuration Item: " +"<literal>APT::Cache::ShowFull</literal>." +msgstr "" +"Gibt die vollst??ndigen Paketdatens??tze beim Suchen aus. " +"Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +msgid "<option>-a</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:317 +msgid "<option>--all-versions</option>" +msgstr "<option>--all-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:318 +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-" +"versions</option> is specified, only the candidate version will displayed " +"(the one which would be selected for installation). This option is only " +"applicable to the <literal>show</literal> command. Configuration Item: " +"<literal>APT::Cache::AllVersions</literal>." +msgstr "" +"Gibt die vollst??ndigen Datens??tze f??r alle verf??gbaren Versionen aus. " +"Dies ist die Vorgabe. Um sie auszuschalten, benutzen Sie <option>--no-all-" +"versions</option>. Wenn <option>--no-all-versions</option> angegeben ist, " +"wird nur die Anw??rterversion angezeigt (die, die zur Installation ausgew??" +"hlt w??rde). Diese Option ist nur f??r den <literal>show</literal>-Befehl " +"anwendbar. Konfigurationselement: <literal>APT::Cache::AllVersions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:326 +msgid "<option>-g</option>" +msgstr "<option>-g</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:326 +msgid "<option>--generate</option>" +msgstr "<option>--generate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:327 +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</" +"option>. Configuration Item: <literal>APT::Cache::Generate</literal>." +msgstr "" +"F??hrt das Neuerstellen des Paketzwischenspeichers aus, anstatt den " +"Zwischenspeicher so zu benutzen, wie er ist. Das ist die Vorgabe. Um sie " +"auszuschalten benutzen Sie <option>--no-generate</option>. " +"Konfigurationselement: <literal>APT::Cache::Generate</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:332 +msgid "<option>--names-only</option>" +msgstr "<option>--names-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:332 apt-cdrom.8.xml:139 +msgid "<option>-n</option>" +msgstr "<option>-n</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:333 +msgid "" +"Only search on the package names, not the long descriptions. Configuration " +"Item: <literal>APT::Cache::NamesOnly</literal>." +msgstr "" +"Durchsucht nur die Paketnamen, nicht die Langbeschreibungen. " +"Konfigurationselement: <literal>APT::Cache::NamesOnly</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:337 +msgid "<option>--all-names</option>" +msgstr "<option>--all-names</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:338 +msgid "" +"Make <literal>pkgnames</literal> print all names, including virtual packages " +"and missing dependencies. Configuration Item: <literal>APT::Cache::" +"AllNames</literal>." +msgstr "" +"L??sst <literal>pkgnames</literal> alle Namen, einschlie??lich virtueller " +"Pakete und fehlender Abh??ngigkeiten, ausgeben. Konfigurationselement: " +"<literal>APT::Cache::AllNames</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:343 +msgid "<option>--recurse</option>" +msgstr "<option>--recurse</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:344 +msgid "" +"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " +"that all packages mentioned are printed once. Configuration Item: " +"<literal>APT::Cache::RecurseDepends</literal>." +msgstr "" +"Macht <literal>depends</literal> und <literal>rdepends</literal> rekursiv, " +"so dass alle erw??hnten Pakete einmal ausgegeben werden. " +"Konfigurationselement: <literal>APT::Cache::RecurseDepends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cache.8.xml:349 +msgid "<option>--installed</option>" +msgstr "<option>--installed</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cache.8.xml:351 +msgid "" +"Limit the output of <literal>depends</literal> and <literal>rdepends</" +"literal> to packages which are currently installed. Configuration Item: " +"<literal>APT::Cache::Installed</literal>." +msgstr "" +"Begrenzt die Ausgabe von <literal>depends</literal> und <literal>rdepends</" +"literal> auf Pakete, die aktuell installiert sind. Konfigurationselement: " +"<literal>APT::Cache::Installed</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 +#: apt-sortpkgs.1.xml:64 +msgid "&apt-commonoptions;" +msgstr "&apt-commonoptions;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 +#: apt.conf.5.xml:968 apt_preferences.5.xml:615 +msgid "Files" +msgstr "Dateien" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-cache.8.xml:363 +msgid "&file-sourceslist; &file-statelists;" +msgstr "&file-sourceslist; &file-statelists;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 +#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 +#: sources.list.5.xml:221 +msgid "See Also" +msgstr "Siehe auch" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:369 +msgid "&apt-conf;, &sources-list;, &apt-get;" +msgstr "&apt-conf;, &sources-list;, &apt-get;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 +#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +msgid "Diagnostics" +msgstr "Diagnose" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cache.8.xml:374 +msgid "" +"<command>apt-cache</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cache</command> gibt bei normalen Operationen 0 zur??ck, " +"dezimal 100 bei Fehlern." + +#. type: Content of: <refentry><refentryinfo> +#: apt-cdrom.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"February 2004</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; " +"<date>14. Februar 2004</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28 +msgid "apt-cdrom" +msgstr "apt-cdrom" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-cdrom.8.xml:29 +msgid "APT CDROM management utility" +msgstr "APT-CDROM-Verwaltungswerkzeug" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-cdrom.8.xml:35 +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>CDROM-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>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:48 +msgid "" +"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " +"available sources. <command>apt-cdrom</command> takes care of determining " +"the structure of the disc as well as correcting for several possible mis-" +"burns and verifying the index files." +msgstr "" +"<command>apt-cdrom</command> wird benutzt, um eine neue CDROM zu APTs Liste " +"der verf??gbaren Quellen hinzuzuf??gen. <command>apt-cdrom</command> k??" +"mmert sich um die festgestellte Struktur des Mediums, sowie die Korrektur f??" +"r mehrere m??gliche Fehlbrennungen und pr??ft die Indexdateien." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:55 +msgid "" +"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " +"system, it cannot be done by hand. Furthermore each disk in a multi-cd set " +"must be inserted and scanned separately to account for possible mis-burns." +msgstr "" +"Es ist notwendig, <command>apt-cdrom</command> zu benutzen, um CDs zum APT-" +"System hinzuzuf??gen. Dies kann nicht manuell erfolgen. Weiterhin muss jedes " +"Medium in einer Zusammenstellung aus mehreren CDs einzeln eingelegt und " +"gescannt werden, um auf m??gliche Fehlbrennungen zu testen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:65 +msgid "add" +msgstr "add" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:66 +msgid "" +"<literal>add</literal> is used to add a new disc to the source list. It will " +"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"to scan it and copy the index files. If the disc does not have a proper " +"<filename>disk</filename> directory you will be prompted for a descriptive " +"title." +msgstr "" +"<literal>add</literal> wird benutzt, um ein neues Medium zur Quellenliste " +"hinzuzuf??gen. Es wird das CDROM-Ger??t aush??ngen, verlangen, dass ein " +"Medium eingelegt wird und dann mit den Einlesen und Kopieren der " +"Indexdateien fortfahren. Wenn das Medium kein angemessenes <filename>disk</" +"filename>-Verzeichnis hat, werden Sie nach einem aussagekr??ftigen Titel " +"gefragt." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:74 +msgid "" +"APT uses a CDROM ID to track which disc is currently in the drive and " +"maintains a database of these IDs in <filename>&statedir;/cdroms.list</" +"filename>" +msgstr "" +"APT benutzt eine CDROM-ID, um nachzuverfolgen, welches Medium gerade im " +"Laufwerk ist und verwaltet eine Datenbank mit diesen IDs in " +"<filename>&statedir;/cdroms.list</filename>" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:81 +msgid "ident" +msgstr "ident" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:82 +msgid "" +"A debugging tool to report the identity of the current disc as well as the " +"stored file name" +msgstr "" +"Ein Fehlersuchwerkzeug, um die Identit??t des aktuellen Mediums sowie den " +"gespeicherten Dateinamen zu berichten." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:61 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present. <placeholder type=\"variablelist" +"\" id=\"0\"/>" +msgstr "" +"Au??er wenn die Option <option>-h</option> oder <option>--help</option> " +"angegeben wurde, muss einer der beiden Befehle unterhalb gegeben sein. " +"<placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt-cdrom.8.xml:91 +msgid "Options" +msgstr "Optionen" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +msgid "<option>-d</option>" +msgstr "<option>-d</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:95 +msgid "<option>--cdrom</option>" +msgstr "<option>--cdrom</option" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:96 +msgid "" +"Mount point; specify the location to mount the cdrom. This mount point must " +"be listed in <filename>/etc/fstab</filename> and properly configured. " +"Configuration Item: <literal>Acquire::cdrom::mount</literal>." +msgstr "" +"Einh??ngepunkt. Gibt den Ort an, an dem die CD-ROM eingeh??ngt wird. Dieser " +"Einh??ngepunkt muss in <filename>/etc/fstab</filename> eingetragen und " +"angemessen konfiguriert sein. Konfigurationselement: <literal>Acquire::" +"cdrom::mount</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:104 +msgid "<option>-r</option>" +msgstr "<option>-r</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:104 +msgid "<option>--rename</option>" +msgstr "<option>--rename</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:105 +msgid "" +"Rename a disc; change the label of a disk or override the disks given label. " +"This option will cause <command>apt-cdrom</command> to prompt for a new " +"label. Configuration Item: <literal>APT::CDROM::Rename</literal>." +msgstr "" +"Ein Medium umbenennen. ??ndert den Namen eines Mediums oder ??berschreibt " +"den Namen, der dem Medium gegeben wurde. Diese Option wird <command>apt-" +"cdrom</command> veranlassen, nach einem neuen Namen zu fragen. " +"Konfigurationselement: <literal>APT::CDROM::Rename</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:113 apt-get.8.xml:347 +msgid "<option>-m</option>" +msgstr "<option>-m</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:113 +msgid "<option>--no-mount</option>" +msgstr "<option>--no-mount</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:114 +msgid "" +"No mounting; prevent <command>apt-cdrom</command> from mounting and " +"unmounting the mount point. Configuration Item: <literal>APT::CDROM::" +"NoMount</literal>." +msgstr "" +"Kein Einh??ngen. Hindert <command>apt-cdrom</command> am Ein- und Aush??ngen " +"des Einh??ngepunkts. Konfigurationselement: <literal>APT::CDROM::NoMount</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:121 +msgid "<option>--fast</option>" +msgstr "<option>--fast</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:122 +msgid "" +"Fast Copy; Assume the package files are valid and do not check every " +"package. This option should be used only if <command>apt-cdrom</command> has " +"been run on this disc before and did not detect any errors. Configuration " +"Item: <literal>APT::CDROM::Fast</literal>." +msgstr "" +"Schnelle Kopie. Unterstellt, dass die Paketdateien g??ltig sind und pr??ft " +"nicht jedes Paket. Diese Option sollte nur benutzt werden, wenn <command>apt-" +"cdrom</command> vorher f??r dieses Medium ausgef??hrt wurde und keine Fehler " +"festgestellt hat. Konfigurationselement: <literal>APT::CDROM::Fast</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:131 +msgid "<option>--thorough</option>" +msgstr "<option>--thorough</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:132 +msgid "" +"Thorough Package Scan; This option may be needed with some old Debian " +"1.1/1.2 discs that have Package files in strange places. It takes much " +"longer to scan the CD but will pick them all up." +msgstr "" +"Gr??ndliche Paketdurchsuchung. Diese Option k??nnte f??r einige alte Debian-" +"1.1/1.2-Medien n??tig sein, die Paketdateien an seltsamen Orten haben. Dies " +"verl??ngert das Durchsuchen des Mediums deutlich, nimmt aber alle auf." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:140 apt-get.8.xml:378 +msgid "<option>--just-print</option>" +msgstr "<option>--just-print</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:141 apt-get.8.xml:380 +msgid "<option>--recon</option>" +msgstr "<option>--recon</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-cdrom.8.xml:142 apt-get.8.xml:381 +msgid "<option>--no-act</option>" +msgstr "<option>--no-act</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-cdrom.8.xml:143 +msgid "" +"No Changes; Do not change the &sources-list; file and do not write index " +"files. Everything is still checked however. Configuration Item: " +"<literal>APT::CDROM::NoAct</literal>." +msgstr "" +"Keine ??nderungen. Die &sources-list;-Datei nicht ??ndern und keine " +"Indexdateien schreiben. Alles wird jedoch immer noch gepr??ft. " +"Konfigurationselement: <literal>APT::CDROM::NoAct</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:156 +msgid "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-conf;, &apt-get;, &sources-list;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-cdrom.8.xml:161 +msgid "" +"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-cdrom</command> gibt bei normalen Operationen 0 zur??ck, " +"dezimal 100 bei Fehlern." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-config.8.xml:22 apt-config.8.xml:29 +msgid "apt-config" +msgstr "apt-config" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-config.8.xml:30 +msgid "APT Configuration Query program" +msgstr "APT-Konfigurationsabfrageprogramm" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-config.8.xml:36 +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>Abbild</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:48 +msgid "" +"<command>apt-config</command> is an internal program used by various " +"portions of the APT suite to provide consistent configurability. It accesses " +"the main configuration file <filename>/etc/apt/apt.conf</filename> in a " +"manner that is easy to use by scripted applications." +msgstr "" +"<command>apt-config</command> ist ein internes Programm, das von vielen " +"Teilen des APT-Pakets benutzt wird, um durchg??ngige Konfigurierbarkeit " +"bereitzustellen. Es greift auf die Hauptkonfigurationsdatei <filename>/etc/" +"apt/apt.conf</filename> auf eine Art zu, die leicht f??r geskriptete " +"Anwendungen zu benutzen ist." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +msgid "" +"Unless the <option>-h</option>, or <option>--help</option> option is given " +"one of the commands below must be present." +msgstr "" +"Au??er, wenn die <option>-h</option>- oder <option>--help</option>-Option " +"angegeben wurde, muss einer der Befehle unterhalb vorkommen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-config.8.xml:58 +msgid "shell" +msgstr "shell" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:60 +msgid "" +"shell is used to access the configuration information from a shell script. " +"It is given pairs of arguments, the first being a shell variable and the " +"second the configuration value to query. As output it lists a series of " +"shell assignments commands for each present value. In a shell script it " +"should be used like:" +msgstr "" +"shell wird benutzt, um aus einem Shellskript auf Konfigurationsinformationen " +"zuzugreifen. Es wird ein Paar aus Argumenten angegeben ??? das erste als " +"Shell-Variable und das zweite als Konfigurationswert zum Abfragen. Als " +"Ausgabe listet es eine Serie von Shell-Zuweisungsbefehlen f??r jeden " +"vorhandenen Wert auf. In einen Shellskript sollte es wie folgt benutzt " +"werden:" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> +#: apt-config.8.xml:68 +#, no-wrap +msgid "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" +msgstr "" +"OPTS=\"-f\"\n" +"RES=`apt-config shell OPTS MyApp::options`\n" +"eval $RES\n" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:73 +msgid "" +"This will set the shell environment variable $OPTS to the value of MyApp::" +"options with a default of <option>-f</option>." +msgstr "" +"Dies wird die Shell-Umgebungsvariable $OPT auf den Wert von MyApp::options " +"mit einer Vorgabe von <option>-f</option> setzen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:77 +msgid "" +"The configuration item may be postfixed with a /[fdbi]. f returns file " +"names, d returns directories, b returns true or false and i returns an " +"integer. Each of the returns is normalized and verified internally." +msgstr "" +"An das Konfigurationselement kann /[fdbi] angeh??ngt werden. f gibt " +"Dateinamen zur??ck, d gibt Verzeichnisse zur??ck, b gibt true oder false " +"zur??ck und i gibt eine Ganzzahl zur??ck. Jede R??ckgabe ist normiert und " +"intern gepr??ft." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-config.8.xml:86 +msgid "Just show the contents of the configuration space." +msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 +#: apt-sortpkgs.1.xml:70 +msgid "&apt-conf;" +msgstr "&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-config.8.xml:109 +msgid "" +"<command>apt-config</command> returns zero on normal operation, decimal 100 " +"on error." +msgstr "" +"<command>apt-config</command> gibt bei normalen Operationen 0 zur??ck, " +"dezimal 100 bei Fehlern." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29 +msgid "apt-extracttemplates" +msgstr "apt-extracttemplates" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 +msgid "1" +msgstr "1" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-extracttemplates.1.xml:30 +msgid "Utility to extract DebConf config and templates from Debian packages" +msgstr "" +"Hilfsprogramm zum Extrahieren der DebConf-Konfiguration und Schablonen von " +"Debian-Paketen" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-extracttemplates.1.xml:36 +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>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:44 +msgid "" +"<command>apt-extracttemplates</command> will take one or more Debian package " +"files as input and write out (to a temporary directory) all associated " +"config scripts and template files. For each passed in package that contains " +"config scripts and templates, one line of output will be generated in the " +"format:" +msgstr "" +"<command>apt-extracttemplates</command> nimmt als Eingabe ein oder mehrere " +"Debian-Paketdateien entgegen und schreibt alle verbundenen " +"Konfigurationsskripte und Schablonendateien (in ein tempor??res Verzeichnis) " +"heraus. F??r jedes ??bergebene Paket das Konfigurationsskripte und " +"Schablonendateien enth??lt, wird eine Ausgabezeile in folgendem Format " +"generiert:" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:49 +msgid "package version template-file config-script" +msgstr "Paket Version Schablonendatei Konfigurationsskript" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:50 +msgid "" +"template-file and config-script are written to the temporary directory " +"specified by the -t or --tempdir (<literal>APT::ExtractTemplates::TempDir</" +"literal>) directory, with filenames of the form <filename>package.template." +"XXXX</filename> and <filename>package.config.XXXX</filename>" +msgstr "" +"Schablonendatei und Konfigurationsskript werden in das tempor??re " +"Verzeichnis geschrieben, das durch -t oder --tempdir (<literal>APT::" +"ExtractTemplates::TempDir</literal>) Verzeichnis mit Dateinamen der Form " +"<filename>package.template.XXXX</filename> und <filename>package.config." +"XXXX</filename> angegeben wurde" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +msgid "<option>-t</option>" +msgstr "<option>-t</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-extracttemplates.1.xml:60 +msgid "<option>--tempdir</option>" +msgstr "<option>--tempdir</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-extracttemplates.1.xml:62 +msgid "" +"Temporary directory in which to write extracted debconf template files and " +"config scripts Configuration Item: <literal>APT::ExtractTemplates::TempDir</" +"literal>" +msgstr "" +"Tempor??res Verzeichnis, in das die extrahierten DebConf-Schablonendateien " +"und Konfigurationsdateien geschrieben werden. Konfigurationselement: " +"<literal>APT::ExtractTemplates::TempDir</literal>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-extracttemplates.1.xml:79 +msgid "" +"<command>apt-extracttemplates</command> returns zero on normal operation, " +"decimal 100 on error." +msgstr "" +"<command>apt-extracttemplates</command> gibt bei normalen Operationen 0 zur??" +"ck, dezimal 100 bei Fehlern." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 +msgid "apt-ftparchive" +msgstr "apt-ftparchive" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-ftparchive.1.xml:30 +msgid "Utility to generate index files" +msgstr "Hilfsprogramm zum Generieren von Indexdateien" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o=<replaceable>config string</replaceable></option></" +#| "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> " +#| "<group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" +msgid "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" +"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" +"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" +"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +"replaceable></arg><arg><replaceable>override</" +"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +"<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></arg></" +"arg> <arg>release <arg choice=\"plain\"><replaceable>path</replaceable></" +"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>config-file</" +"replaceable></arg> <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" +"\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" +msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o=<replaceable>Konfigurationszeichenkette</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>Pfadvorsilbe</replaceable></arg></arg></arg> " +"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>Pfad</" +"replaceable></arg><arg><replaceable>??berschreiben</" +"replaceable><arg><replaceable>Pfadvorsilbe</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>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:56 +msgid "" +"<command>apt-ftparchive</command> is the command line tool that generates " +"the index files that APT uses to access a distribution source. The index " +"files should be generated on the origin site based on the content of that " +"site." +msgstr "" +"<command>apt-ftparchive</command> ist das Befehlszeilenwerkzeug, das " +"Indexdateien generiert, die APT zum Zugriff auf eine Distributionsquelle " +"benutzt. Die Indexdateien sollten auf der Ursprungs-Site auf Basis des " +"Inhalts dieser Stelle generiert werden." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:60 +msgid "" +"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " +"program, incorporating its entire functionality via the <literal>packages</" +"literal> command. It also contains a contents file generator, " +"<literal>contents</literal>, and an elaborate means to 'script' the " +"generation process for a complete archive." +msgstr "" +"<command>apt-ftparchive</command> ist eine Obermenge des &dpkg-scanpackages;-" +"Programms, das dessen ganze Funktionalit??t ??ber den <literal>packages</" +"literal>-Befehl enth??lt ist ein durchdachtes Mittel den Generierungsprozess " +"f??r ein komplettes Archiv zu ??skripten??." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:66 +msgid "" +"Internally <command>apt-ftparchive</command> can make use of binary " +"databases to cache the contents of a .deb file and it does not rely on any " +"external programs aside from &gzip;. When doing a full generate it " +"automatically performs file-change checks and builds the desired compressed " +"output files." +msgstr "" +"Intern kann <command>apt-ftparchive</command> von Programmdatenb??nken " +"Gebrauch machen, um die Inhalte einer .deb-Datei zwischenzuspeichern und es " +"verl??sst sich nicht auf irgendwelche externen Programme, abgesehen von " +"&gzip;. Wenn eine vollst??ndige Generierung erfolgt, werden automatisch " +"Datei??nderungspr??fungen durchgef??hrt und die gew??nschten gepackten " +"Ausgabedateien erzeugt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:75 +msgid "packages" +msgstr "packages" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:77 +msgid "" +"The packages command generates a package file from a directory tree. It " +"takes the given directory and recursively searches it for .deb files, " +"emitting a package record to stdout for each. This command is approximately " +"equivalent to &dpkg-scanpackages;." +msgstr "" +"Der packages-Befehl generiert eine Paketdatei aus einem Verzeichnisbaum. Er " +"nimmt ein vorgegebenes Verzeichnis und durchsucht es rekursiv nach .deb-" +"Dateien, wobei es f??r jede einen Paketdatensatz auf stdout ausgibt.Dieser " +"Befehl entspricht etwa &dpkg-scanpackages;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." +msgstr "" +"Die Option <option>--db</option> kann benutzt werden, um eine Datenbank zum " +"Zwischenspeichern von Programmen anzugeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:85 +msgid "sources" +msgstr "sources" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:87 +msgid "" +"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, emitting a source record to stdout for each. This command is " +"approximately equivalent to &dpkg-scansources;." +msgstr "" +"Der <literal>sources</literal>-Befehl generiert eine Quellenindexdatei aus " +"einem Verzeichnisbaum. Er nimmt ein vorgegebenes Verzeichnis und durchsucht " +"es rekursiv nach .dsc-Dateien, wobei es f??r jede einen Quelldatensatz auf " +"stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:92 +msgid "" +"If an override file is specified then a source override file will be looked " +"for with an extension of .src. The --source-override option can be used to " +"change the source override file that will be used." +msgstr "" +"Wenn eine Override-Datei angegeben ist, wird nach einer Quellen-Override-" +"Datei mit einer .src-Dateiendung gesucht. Die Option --source-override kann " +"benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ??ndern." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:97 +msgid "contents" +msgstr "contents" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:99 +msgid "" +"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, and reads the file list from each file. It then sorts and " +"writes to stdout the list of files matched to packages. Directories are not " +"written to the output. If multiple packages own the same file then each " +"package is separated by a comma in the output." +msgstr "" +"Der <literal>contents</literal>-Befehl generiert eine Inhaltsdatei aus einem " +"Verzeichnisbaum. Er nimmt ein vorgegebenes Verzeichnis und durchsucht es " +"rekursiv nach .deb-Dateien und liest die Dateiliste von jeder Datei. Dann " +"sortiert er die Liste der passenden Pakete und schreibt sie nach stdout. " +"Verzeichnisse werden nicht in die Ausgabe geschrieben. Falls mehrere Pakete " +"die gleiche Datei besitzen, dann befindet sich jedes Paket durch Komma " +"getrennt in der Ausgabe." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:109 +msgid "release" +msgstr "release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:111 +msgid "" +"The <literal>release</literal> command generates a Release file from a " +"directory tree. It recursively searches the given directory for Packages, " +"Packages.gz, Packages.bz2, Sources, Sources.gz, Sources.bz2, Release and " +"md5sum.txt files. It then writes to stdout a Release file containing an MD5 " +"digest and SHA1 digest for each file." +msgstr "" +"Der <literal>release</literal>-Befehl generiert eine Release-Datei aus einem " +"Verzeichnisbaum. Er durchsucht das vorgegebene Verzeichnis rekursiv nach " +"Packages-, Packages.gz-, Packages.bz2-, Sources-, Sources.gz-, Sources.bz2-, " +"Release- und md5sum.txt-Dateien. Dann schreibt es eine Releasedatei nach " +"stdout, die einen MD5- und SHA1-Hash f??r jede Datei enth??lt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:118 +msgid "" +"Values for the additional metadata fields in the Release file are taken from " +"the corresponding variables under <literal>APT::FTPArchive::Release</" +"literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The " +"supported fields are: <literal>Origin</literal>, <literal>Label</literal>, " +"<literal>Suite</literal>, <literal>Version</literal>, <literal>Codename</" +"literal>, <literal>Date</literal>, <literal>Architectures</literal>, " +"<literal>Components</literal>, <literal>Description</literal>." +msgstr "" +"Werte f??r zus??tzliche Metadatenfelder in der Release-Datei werden den " +"entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> " +"entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die " +"unterst??tzten Felder sind: <literal>Origin</literal>, <literal>Label</" +"literal>, <literal>Suite</literal>, <literal>Version</literal>, " +"<literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:128 +msgid "generate" +msgstr "generate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:130 +msgid "" +"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 provides a flexible means of specifying which index files " +"are built from which directories, as well as providing a simple means of " +"maintaining the required settings." +msgstr "" +"Der <literal>generate</literal>-Befehl wurde entworfen, um von einem Cron-" +"Skript ausf??hrbar zu sein und bildet Indizes, die der angegebenen " +"Konfigurationsdatei entsprechen. Die Konfigurationssprache stellt eine " +"flexible M??glichkeit bereit, um anzugeben, welche Indexdateien von welchen " +"Verzeichnissen gebildet wurden, ebenso wie sie eine einfache M??glichkeit " +"zur Verwaltung der erforderlichen Einstellungen bereitstellt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +msgid "clean" +msgstr "clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:139 +msgid "" +"The <literal>clean</literal> command tidies the databases used by the given " +"configuration file by removing any records that are no longer necessary." +msgstr "" +"Der <literal>clean</literal>-Befehl r??umt die Datenbanken auf, die von der " +"angegebenen Konfigurationsdatei benutzt wurden, indem es nicht l??nger n??" +"tige Datens??tze entfernt." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:145 +msgid "The Generate Configuration" +msgstr "Die Generate-Konfiguration" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:147 +msgid "" +"The <literal>generate</literal> command uses a configuration file to " +"describe the archives that are going to be generated. It follows the typical " +"ISC configuration format as seen in ISC tools like bind 8 and dhcpd. &apt-" +"conf; contains a description of the syntax. Note that the generate " +"configuration is parsed in sectional manner, but &apt-conf; is parsed in a " +"tree manner. This only effects how the scope tag is handled." +msgstr "" +"Der <literal>generate</literal>-Befehl benutzt eine Konfigurationsdatei, um " +"die Archive zu beschreiben, die generiert werden sollen. Es folgt dem " +"typischen ISC-Konfigurationsformat, wie es in ISC-Werkzeugen wie Bind 8 oder " +"DHCP gesehen werden kann. &apt-conf; enth??lt eine Beschreibung der Syntax. " +"Beachten Sie, dass die generate-Konfiguration abschnittsweise ausgewertet " +"wird, &apt-conf; aber baumartig ausgewertet wird. Dies hat nur Auswirkungen, " +"wenn die Markierung ??scope?? behandelt wird." + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:155 +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"Die generate-Konfiguration hat vier getrennte Abschnitte, jeder ist " +"unterhalb beschrieben" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:157 +msgid "Dir Section" +msgstr "Dir-Abschnitt" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:159 +msgid "" +"The <literal>Dir</literal> section defines the standard directories needed " +"to locate the files required during the generation process. These " +"directories are prepended to certain relative paths defined in later " +"sections to produce a complete an absolute path." +msgstr "" +"Der <literal>Dir</literal>-Abschnitt definiert die Vorgabeverzeichnisse, die " +"zum Orten der ben??tigten Dateien w??hrend des Generierungsprozesses " +"gebraucht werden. Diese Verzeichnisse werden bestimmten relativen Pfaden, " +"die in sp??teren Abschnitten definiert werden, vorangestellt, um einen " +"vollst??ndigen absoluten Pfad zu bilden." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:164 +msgid "ArchiveDir" +msgstr "ArchiveDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:166 +msgid "" +"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." +msgstr "" +"Gibt die Wurzel des FTP-Archivs an. In einer Debian-Standardkonfiguration " +"ist das das Verzeichnis, das die <filename>ls-LR</filename>- und dist-Knoten " +"enth??lt." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:171 +msgid "OverrideDir" +msgstr "OverrideDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:173 +msgid "Specifies the location of the override files." +msgstr "Gibt den Ort der Override-Dateien an" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:176 +msgid "CacheDir" +msgstr "CacheDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:178 +msgid "Specifies the location of the cache files" +msgstr "Gibt den Ort der Zwischenspeicherdateien an" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:181 +msgid "FileListDir" +msgstr "FileListDir" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:183 +msgid "" +"Specifies the location of the file list files, if the <literal>FileList</" +"literal> setting is used below." +msgstr "" +"Gibt den Ort der Dateilistendateien an, wenn die <literal>FileList</literal> " +"unterhalb gesetzt ist." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:189 +msgid "Default Section" +msgstr "Vorgabe-Abschnitt" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:191 +msgid "" +"The <literal>Default</literal> section specifies default values, and " +"settings that control the operation of the generator. Other sections may " +"override these defaults with a per-section setting." +msgstr "" +"Der <literal>Default</literal>-Abschnitt gibt Vorgabewerte an und " +"Einstellungen, die den Betrieb des Generators steuern. Andere Abschnitte k??" +"nnen diese Vorgaben mit einer Einstellung pro Abschnitt ??berschreiben." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:195 +msgid "Packages::Compress" +msgstr "Packages::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:197 +msgid "" +"Sets the default compression schemes to use for the Package index files. It " +"is a string that contains a space separated list of at least one of: '.' (no " +"compression), 'gzip' and 'bzip2'. The default for all compression schemes is " +"'. gzip'." +msgstr "" +"Setzt das Vorgabe-Kompressionsschema, das f??r die Paketindexdateien benutzt " +"wird. Es ist eine Zeichenkette, die eine durch Leerzeichen getrennte Liste " +"mit mindestens einem der folgenden Dinge enth??lt: ??.?? (keine " +"Kompression), ??gzip?? und ??bzip2??. Die Vorgabe f??r alle " +"Kompressionsschemata ist ??. gzip??." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:203 +msgid "Packages::Extensions" +msgstr "Packages::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:205 +msgid "" +"Sets the default list of file extensions that are package files. This " +"defaults to '.deb'." +msgstr "" +"Setzt die Vorgabeliste von Dateierweiterungen, die Paketdateien sind. " +"Vorgabe ist ??.deb??." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:209 +msgid "Sources::Compress" +msgstr "Sources::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:211 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Sources files." +msgstr "" +"Dies ist <literal>Packages::Compress</literal> ??hnlich, au??er dass es die " +"Kompression der Quelldateien steuert." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:215 +msgid "Sources::Extensions" +msgstr "Sources::Extensions" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:217 +msgid "" +"Sets the default list of file extensions that are source files. This " +"defaults to '.dsc'." +msgstr "" +"Setzt die Vorgabeliste von Dateierweiterungen, die Quelldateien sind. " +"Vorgabe ist ??.dsc??." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:221 +msgid "Contents::Compress" +msgstr "Contents::Compress" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:223 +msgid "" +"This is similar to <literal>Packages::Compress</literal> except that it " +"controls the compression for the Contents files." +msgstr "" +"Dies ist <literal>Packages::Compress</literal> ??hnlich, au??er dass es die " +"Kompression der Inhaltsdateien steuert." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:227 +msgid "DeLinkLimit" +msgstr "DeLinkLimit" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:229 +msgid "" +"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." +msgstr "" +"Gibt die Anzahl von Kilobytes an, die pro Durchlauf delinkt (und durch " +"Hardlinks ersetzt) werden sollen. Dies wird in Verbindung mit der " +"<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:234 +msgid "FileMode" +msgstr "FileMode" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:236 +msgid "" +"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." +msgstr "" +"Gibt die Rechte f??r alle erstellten Indexdateien an. Vorgabe ist 0644. Alle " +"Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:243 +msgid "TreeDefault Section" +msgstr "TreeDefault-Abschnitt" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:245 +msgid "" +"Sets defaults specific to <literal>Tree</literal> sections. All of these " +"variables are substitution variables and have the strings $(DIST), " +"$(SECTION) and $(ARCH) replaced with their respective values." +msgstr "" +"Setzt Vorgaben speziell f??r <literal>Tree</literal>-Abschnitte. All diese " +"Variablen sind Platzhaltervariablen und haben die Zeichenketten $(DIST), " +"$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:250 +msgid "MaxContentsChange" +msgstr "MaxContentsChange" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:252 +msgid "" +"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." +msgstr "" +"Setzt die Anzahl der Kilobytes der Inhaltdateien, die jeden Tag generiert " +"werden. Die Inhaltdateien werden reihum ersetzt, so dass sie ??ber mehrere " +"Tage alle neu gebildet werden." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:257 +msgid "ContentsAge" +msgstr "ContentsAge" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:259 +msgid "" +"Controls the number of days a contents file is allowed to be checked without " +"changing. If this limit is passed the mtime of the contents file is updated. " +"This case can occur if the package file is changed in such a way that does " +"not result in a new contents file [override edit for instance]. A hold off " +"is allowed in hopes that new .debs will be installed, requiring a new file " +"anyhow. The default is 10, the units are in days." +msgstr "" +"Steuert die Anzahl der Tage, die eine Inhaltsdatei erlaubt ist ohne ??" +"nderung gepr??ft zu werden. Wenn die Grenze ??berschritten ist, wird die " +"mtime der Inhaltsdatei aktualisiert. Dieser Fall kann auftreten, wenn die " +"Package-Datei auf einem Weg ge??ndert wurde, der nicht in einer neuen " +"Inhaltsdatei resultierte [??berschreibendes Bearbeiten zum Beispiel]. Ein " +"Aufhalten ist erlaubt, in der Hoffnung dass neue .debs installiert werden, " +"die sowieso eine neue Datei ben??tigen. Die Vorgabe ist 10, die Einheiten " +"sind Tage." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:268 +msgid "Directory" +msgstr "Directory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:270 +msgid "" +"Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename>" +msgstr "" +"Setzt den Beginn des .deb-Verzeichnisbaumes. Vorgabe ist <filename>$(DIST)/" +"$(SECTION)/binary-$(ARCH)/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:274 +msgid "SrcDirectory" +msgstr "SrcDirectory" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:276 +msgid "" +"Sets the top of the source package directory tree. Defaults to <filename>" +"$(DIST)/$(SECTION)/source/</filename>" +msgstr "" +"Setzt den Beginn des Quellpaketverzeichnisbaumes. Vorgabe ist <filename>" +"$(DIST)/$(SECTION)/source/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +msgid "Packages" +msgstr "Packages" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:282 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"binary-$(ARCH)/Packages</filename>" +msgstr "" +"Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/" +"binary-$(ARCH)/Packages</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +msgid "Sources" +msgstr "Sources" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:288 +msgid "" +"Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +"source/Sources</filename>" +msgstr "" +"Setzt die Ausgabe-Packages-Datei. Vorgabe ist <filename>$(DIST)/$(SECTION)/" +"source/Sources</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:292 +msgid "InternalPrefix" +msgstr "InternalPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:294 +msgid "" +"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>" +msgstr "" +"Setzt die Pfad-Pr??fix, die bewirkt, dass ein symbolischer Verweis wie ein " +"interner anstatt wie ein externer Verweis behandelt wird. Vorgabe ist " +"<filename>$(DIST)/$(SECTION)/</filename>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +msgid "Contents" +msgstr "Contents" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:301 +msgid "" +"Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" +"</filename>. If this setting causes multiple Packages files to map onto a " +"single Contents file (such as the default) then <command>apt-ftparchive</" +"command> will integrate those package files together automatically." +msgstr "" +"Setzt die Ausgabe-Contens-Datei. Vorgabe ist <filename>$(DIST)/Contents-" +"$(ARCH)</filename>. Wenn diese Einstellung bewirkt, dass mehrere " +"Paketdateien auf einer einzelnen Inhaltsdatei abgebildet werden (so wie es " +"Vorgabe ist), dann wird <command>apt-ftparchive</command> diese Dateien " +"automatisch integrieren." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:308 +msgid "Contents::Header" +msgstr "Contents::Header" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:310 +msgid "Sets header file to prepend to the contents output." +msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +msgid "BinCacheDB" +msgstr "BinCacheDB" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:315 +msgid "" +"Sets the binary cache database to use for this section. Multiple sections " +"can share the same database." +msgstr "" +"Setzt die Programmzwischenspeicherdatenbank zur Benutzung in diesem " +"Abschnitt. Mehrere Abschnitte k??nnen sich die gleiche Datenbank teilen." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:319 +msgid "FileList" +msgstr "FileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:321 +msgid "" +"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." +msgstr "" +"Gibt an, dass <command>apt-ftparchive</command> die Liste der Dateien aus " +"der vorgegebenen Datei liest, anstatt den Verzeichnisbaum zu durchlaufen. " +"Relativen Dateinamen wird das Archivverzeichnis vorangestellt." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:326 +msgid "SourceFileList" +msgstr "SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:328 +msgid "" +"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. This is used " +"when processing source indexes." +msgstr "" +"Gibt an, dass <command>apt-ftparchive</command> die Liste der Dateien aus " +"der vorgegebenen Datei liest, anstatt den Verzeichnisbaum zu durchlaufen. " +"Relativen Dateinamen wird das Archivverzeichnis vorangestellt. Dies wird " +"benutzt, wenn Quellindizes verarbeitet werden." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:336 +msgid "Tree Section" +msgstr "Tree-Abschnitt" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:338 +msgid "" +"The <literal>Tree</literal> section defines a standard Debian file tree " +"which consists of a base directory, then multiple sections in that base " +"directory and finally multiple Architectures in each section. The exact " +"pathing used is defined by the <literal>Directory</literal> substitution " +"variable." +msgstr "" +"Der <literal>Tree</literal>-Abschnitt definiert einen Standard-Debian-" +"Dateibaum, der aus einem Basisverzeichnis, dann mehreren Abschnitten in " +"diesem Basisverzeichnis und am Ende, mehreren Architekturen in jedem " +"Abschnitt besteht. Die genaue benutzte Pfadeinstellung ist durch die " +"<literal>Directory</literal>-Ersetzungsvariable definiert." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:343 +msgid "" +"The <literal>Tree</literal> section takes a scope tag which sets the " +"<literal>$(DIST)</literal> variable and defines the root of the tree (the " +"path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " +"setting such as <filename>dists/woody</filename>." +msgstr "" +"Der <literal>Tree</literal>-Abschnitt nimmt eine scope-Markierung, die die " +"<literal>$(DIST)</literal>-Variable setzt und die Wurzel des Baumes " +"definiert (der Pfad hat den Pr??fix von <literal>ArchiveDir</literal>). " +"Typischerweise ist dies eine Einstellung wie <filename>dists/woody</" +"filename>." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:348 +msgid "" +"All of the settings defined in the <literal>TreeDefault</literal> section " +"can be use in a <literal>Tree</literal> section as well as three new " +"variables." +msgstr "" +"Alle im <literal>TreeDefault</literal>-Abschnitt definierten Einstellungen " +"k??nnen in einem <literal>Tree</literal>-Abschnitt, sowie als drei neue " +"Variablen benutzt werden." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:351 +msgid "" +"When processing a <literal>Tree</literal> section <command>apt-ftparchive</" +"command> performs an operation similar to:" +msgstr "" +"Wenn ein <literal>Tree</literal>-Abschnitt bearbeitet wird, f??hrt " +"<command>apt-ftparchive</command> eine Operation aus, die folgender ??hnelt:" + +# report, that this string is missing in man page +#. type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> +#: apt-ftparchive.1.xml:354 +#, no-wrap +msgid "" +"for i in Sections do \n" +" for j in Architectures do\n" +" Generate for DIST=scope SECTION=i ARCH=j\n" +msgstr "" +"for i in Abschnitte do \n" +" for j in Architekturen do\n" +" Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:360 +msgid "Sections" +msgstr "Abschnitte" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:362 +msgid "" +"This is a space separated list of sections which appear under the " +"distribution, typically this is something like <literal>main contrib non-" +"free</literal>" +msgstr "" +"Dies ist eine durch Leerzeichen getrennte Liste der Abschnitte, die unter " +"der Distribution erscheint, typischerweise etwas wie <literal>main contrib " +"non-free</literal>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:367 +msgid "Architectures" +msgstr "Architekturen" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:369 +msgid "" +"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." +msgstr "" +"Dies ist eine durch Leerzeichen getrennte Liste aller Architekturen, die " +"unter dem Suchabschnitt erscheinen. Die spezielle Architektur ??source?? " +"wird benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +msgid "BinOverride" +msgstr "BinOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:376 +msgid "" +"Sets the binary override file. The override file contains section, priority " +"and maintainer address information." +msgstr "" +"Setzt die Programm-Override-Datei. Die Override-Datei enth??lt Abschnitt, " +"Priorit??t und Adressinformationen des Betreuers." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +msgid "SrcOverride" +msgstr "SrcOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:382 +msgid "" +"Sets the source override file. The override file contains section " +"information." +msgstr "" +"Setzt die Quell-Override-Datei. Die Override-Datei enth??lt " +"Abschnittsinformationen." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +msgid "ExtraOverride" +msgstr "ExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +msgid "Sets the binary extra override file." +msgstr "Setzt die zus??tzliche Programm-Override-Datei." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +msgid "SrcExtraOverride" +msgstr "SrcExtraOverride" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +msgid "Sets the source extra override file." +msgstr "Setzt die zus??tzliche Quell-Override-Datei." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt-ftparchive.1.xml:398 +msgid "BinDirectory Section" +msgstr "BinDirectory-Abschnitt" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt-ftparchive.1.xml:400 +msgid "" +"The <literal>bindirectory</literal> section defines a binary directory tree " +"with no special structure. The scope tag specifies the location of the " +"binary directory and the settings are similar to the <literal>Tree</literal> " +"section with no substitution variables or <literal>Section</" +"literal><literal>Architecture</literal> settings." +msgstr "" +"Der <literal>bindirectory</literal>-Abschnitt definiert einen " +"Programmverzeichnisbaum ohne spezielle Struktur. Die scope-Markierung gibt " +"den Ort des Programmverzeichnisses an und die Einstellungen sind denen des " +"<literal>Tree</literal>-Abschnitts ohne Platzhaltervariablen oder " +"<literal>Abschnitt</literal><literal>Architektur</literal> ??hnlich." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:408 +msgid "Sets the Packages file output." +msgstr "Setzt die Packages-Dateiausgabe." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:413 +msgid "" +"Sets the Sources file output. At least one of <literal>Packages</literal> or " +"<literal>Sources</literal> is required." +msgstr "" +"Setzt die Sources-Dateiausgabe. Entweder <literal>Packages</literal> oder " +"<literal>Sources</literal> ist erforderlich." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:419 +msgid "Sets the Contents file output. (optional)" +msgstr "Setzt die Contents-Dateiausgabe. (optional)" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:424 +msgid "Sets the binary override file." +msgstr "Setzt die Programm-Override-Datei." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:429 +msgid "Sets the source override file." +msgstr "Setzt die Quell-Override-Datei." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:444 +msgid "Sets the cache DB." +msgstr "Setzt die Zwischenspeicherdatenbank." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:447 +msgid "PathPrefix" +msgstr "PathPrefix" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:449 +msgid "Appends a path to all the output paths." +msgstr "H??ngt einen Pfad an alle Ausgabepfade an." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:452 +msgid "FileList, SourceFileList" +msgstr "FileList, SourceFileList" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:454 +msgid "Specifies the file list file." +msgstr "Gibt die Dateilistendatei an." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:461 +msgid "The Binary Override File" +msgstr "Die Programm-Override-Datei " + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:462 +msgid "" +"The binary override file is fully compatible with &dpkg-scanpackages;. It " +"contains 4 fields separated by spaces. The first field is the package name, " +"the second is the priority to force that package to, the third is the the " +"section to force that package to and the final field is the maintainer " +"permutation field." +msgstr "" +"Die Programm-Override-Datei ist vollst??ndig zu &dpkg-scanpackages; " +"kompatibel. Sie enth??lt vier durch Leerzeichen getrennte Felder. Das erste " +"Feld ist der Paketname, das zweite ist die Priorit??t zu der das Paket " +"erzwungen wird, das dritte ist der Abschnittzu der das Paket erzwungen wird " +"und das letzte Feld ist das Betreuerumsetzungsfeld." + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:468 +#, no-wrap +msgid "old [// oldn]* => new" +msgstr "alt [// oldn]* => neu" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: apt-ftparchive.1.xml:470 +#, no-wrap +msgid "new" +msgstr "neu" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:467 +msgid "" +"The general form of the maintainer field is: <placeholder type=" +"\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " +"id=\"1\"/> The first form allows a double-slash separated list of old email " +"addresses to be specified. If any of those are found then new is substituted " +"for the maintainer field. The second form unconditionally substitutes the " +"maintainer field." +msgstr "" +"Die allgemeine Form des Betreuerfelds ist: <placeholder type=\"literallayout" +"\" id=\"0\"/> oder einfach <placeholder type=\"literallayout\" id=\"1\"/>. " +"Die erste Form erlaubt es, eine durch Doppelschr??gstrich getrennte Liste " +"alter E-Mail-Adressen anzugegeben. Wenn eine davon gefunden wird, wird die " +"neue f??r das Betreuerfeld ersetzt. Die zweite Form ersetzt das Betreuerfeld " +"bedingungslos." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:478 +msgid "The Source Override File" +msgstr "Die Quell-Override-Datei" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:480 +msgid "" +"The source override file is fully compatible with &dpkg-scansources;. It " +"contains 2 fields separated by spaces. The first fields is the source " +"package name, the second is the section to assign it." +msgstr "" +"Die Quell-Override-Datei ist vollst??ndig kompatibel zu &dpkg-scansources;. " +"Sie enth??lt zwei durch Leerzeichen getrennte Felder. Das erste Feld ist der " +"Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:485 +msgid "The Extra Override File" +msgstr "Die zus??tzlich Override-Datei" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:487 +msgid "" +"The extra override file allows any arbitrary tag to be added or replaced in " +"the output. It has 3 columns, the first is the package, the second is the " +"tag and the remainder of the line is the new value." +msgstr "" +"Die zus??tzlich Override-Datei erlaubt jeder beliebigen Markierung zur " +"Ausgabe hinzugef??gt oder darin ersetzt zu werden. Sie hat drei Spalten. Die " +"erste ist das Paket, die zweite ist die Markierung und der Rest der Zeile " +"ist der neue Wert." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:496 +msgid "<option>--md5</option>" +msgstr "<option>--md5</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:498 +msgid "" +"Generate MD5 sums. This defaults to on, when turned off the generated index " +"files will not have MD5Sum fields where possible. Configuration Item: " +"<literal>APT::FTPArchive::MD5</literal>" +msgstr "" +"Generiert MD5-Summen. Dies ist standardm????ig an, wenn es ausgeschaltet " +"ist, haben die generierten Indexdateien keine MD5Sum-Felder, sofern dies m??" +"glich ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:503 +msgid "<option>--db</option>" +msgstr "<option>--db</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:505 +msgid "" +"Use a binary caching DB. This has no effect on the generate command. " +"Configuration Item: <literal>APT::FTPArchive::DB</literal>." +msgstr "" +"Benutzt eine Programmzwischenspeicherdatenbank. Dies hat keine Auswirkung " +"auf den generate-Befehl. Konfigurationselement: <literal>APT::FTPArchive::" +"DB</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:511 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Configuration Item: <literal>quiet</literal>." +msgstr "" +"Still; erzeugt eine Ausgabe, die f??r Protokollierung geeignet ist und " +"Fortschrittsanzeiger wegl??sst. Mehr ??q??s unterdr??cken mehr Ausgaben, bis " +"zu einem Maximum von 2. Sie k??nnen au??erdem <option>-q=#</option> " +"benutzen, um die Stillestufe zu setzen, was die Konfigurationsdatei ??" +"berschreibt. Konfigurationselement: <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:517 +msgid "<option>--delink</option>" +msgstr "<option>--delink</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:519 +msgid "" +"Perform Delinking. If the <literal>External-Links</literal> setting is used " +"then this option actually enables delinking of the files. It defaults to on " +"and can be turned off with <option>--no-delink</option>. Configuration " +"Item: <literal>APT::FTPArchive::DeLinkAct</literal>." +msgstr "" +"F??hrt Delinking aus. Wenn die <literal>External-Links</literal>-Einstellung " +"benutzt wird, schaltet diese Option das Delinking zu Dateien ein. " +"Standardm????ig ist es an und kann mit <option>--no-delink</option> " +"ausgeschaltet werden. Konfigurationselement: <literal>APT::FTPArchive::" +"DeLinkAct</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:525 +msgid "<option>--contents</option>" +msgstr "<option>--contents</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:527 +msgid "" +"Perform contents generation. When this option is set and package indexes are " +"being generated with a cache DB then the file listing will also be extracted " +"and stored in the DB for later use. When using the generate command this " +"option also allows the creation of any Contents files. The default is on. " +"Configuration Item: <literal>APT::FTPArchive::Contents</literal>." +msgstr "" +"F??hrt Inhaltsgenerierung durch. Wenn diese Option gesetzt ist und " +"Paketindizes mit einer Zwischenspeicherdatenbank generiert werden, dann wird " +"die Dateiliste auch extrahiert und f??r sp??tere Benutzung in der Datenbank " +"gespeichert. Wenn der generate-Befehl benutzt wird, erlaubt diese Option au??" +"erdem die Erzeugung beliebiger Contents-Dateien. Die Vorgabe ist an. " +"Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:535 +msgid "<option>--source-override</option>" +msgstr "<option>--source-override</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:537 +msgid "" +"Select the source override file to use with the <literal>sources</literal> " +"command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" +"literal>." +msgstr "" +"W??hlt die Quell-Override-Datei, die mit dem <literal>sources</literal>-" +"Befehl benutzt wird. Konfigurationselement: <literal>APT::FTPArchive::" +"SourceOverride</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:541 +msgid "<option>--readonly</option>" +msgstr "<option>--readonly</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:543 +msgid "" +"Make the caching databases read only. Configuration Item: <literal>APT::" +"FTPArchive::ReadOnlyDB</literal>." +msgstr "" +"Gibt der Zwischenspeicherdatenbank nur Lesezugriff. Konfigurationselement: " +"<literal>APT::FTPArchive::ReadOnlyDB</literal>." + +#. type: Content of: <refentry><refsect1><title> +#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 +#: sources.list.5.xml:181 +msgid "Examples" +msgstr "Beispiele" + +#. type: Content of: <refentry><refsect1><para><programlisting> +#: apt-ftparchive.1.xml:558 +#, no-wrap +msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" +msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:554 +msgid "" +"To create a compressed Packages file for a directory containing binary " +"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Um eine gepackte Paketdatei f??r ein Verzeichnis zu erstellen, das " +"Programmpakete (.deb) enth??lt: <placeholder type=\"programlisting\" id=\"0" +"\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-ftparchive.1.xml:568 +msgid "" +"<command>apt-ftparchive</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-ftparchive</command> gibt bei normalen Operationen 0 zur??ck, " +"dezimal 100 bei Fehlern." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-get.8.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"November 2008</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>8. " +"November 2008</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-get.8.xml:22 apt-get.8.xml:29 +msgid "apt-get" +msgstr "apt-get" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-get.8.xml:30 +msgid "APT package handling utility -- command-line interface" +msgstr "APT-Werkzeug f??r den Umgang mit Paketen -- Befehlszeilenschnittstelle" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-get.8.xml:36 +msgid "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> " +"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> " +"<option>-t=</option> <group choice='req'> <arg choice='plain'> " +"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> " +"<replaceable>target_release_number_expression</replaceable> </arg> <arg " +"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</" +"replaceable> </arg> <arg choice='plain'> /" +"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </" +"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> " +"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg " +"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>target_release_name</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>target_release_codename</replaceable> </arg> </" +"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain" +"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg " +"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg " +"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg " +"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg " +"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " +"</group> </arg> </group>" +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> <group choice='req'> <arg " +"choice='plain'> <replaceable>Ziel-Release-Name</replaceable> </arg> <arg " +"choice='plain'> <replaceable>numerischer Ziel-Release-Ausdruck</replaceable> " +"</arg> <arg choice='plain'> <replaceable>Ziel-Release-Codename</replaceable> " +"</arg> </group> </arg> <group choice=\"req\"> <arg choice='plain'>update</" +"arg> <arg choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</" +"arg> <arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>Paketversionsnummer</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-Release-Name</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>Ziel-Release-" +"Codename</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>Paketversionsnummer</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>Ziel-Release-Name</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>Ziel-Release-Codename</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>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:126 +msgid "" +"<command>apt-get</command> is the command-line tool for handling packages, " +"and may be considered the user's \"back-end\" to other tools using the APT " +"library. Several \"front-end\" interfaces exist, such as &dselect;, " +"&aptitude;, &synaptic;, &gnome-apt; and &wajig;." +msgstr "" +"<command>apt-get</command> ist ein Befehlszeilenwerkzeug zur Handhabung von " +"Paketen und k??nnte als ??Backend?? anderer Werkzeugen betrachtet werden, " +"die die APT-Bibliothek benutzen. Es existieren mehrere Oberfl??" +"chenschnittstellen, wie &dselect;, &aptitude;, &synaptic;, &gnome-apt; und " +"&wajig;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:135 apt-key.8.xml:123 +msgid "update" +msgstr "update" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:136 +msgid "" +"<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>. For " +"example, when using a Debian archive, this command retrieves and scans the " +"<filename>Packages.gz</filename> files, so that information about new and " +"updated packages is available. An <literal>update</literal> should always be " +"performed before an <literal>upgrade</literal> or <literal>dist-upgrade</" +"literal>. Please be aware that the overall progress meter will be incorrect " +"as the size of the package files cannot be known in advance." +msgstr "" +"<literal>update</literal> wird benutzt, um die Paketindexdatei wieder mit " +"ihren Quellen zu synchronisieren. Die Indizes verf??gbarer Pakete werden von " +"den in <filename>/etc/apt/sources.list</filename> angegebenen Orten geladen. " +"Wenn Sie zum Beispiel ein Debian-Archiv benutzen, erneuert dieser Befehl die " +"<filename>Packages.gz</filename>-Dateien und wertet sie aus, so dass " +"Informationen ??ber neue und aktualisierte Pakete verf??gbar sind. Ein " +"<literal>update</literal> sollte immer vor einem <literal>upgrade</literal> " +"oder <literal>dist-upgrade</literal> ausgef??hrt werden. Bitte seien Sie " +"sich bewusst, dass die Gesamtfortschrittsanzeige nicht richtig sein wird, da " +"die Gr????e der Pakete nicht im voraus bekannt ist." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:147 +msgid "upgrade" +msgstr "upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:148 +msgid "" +"<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 new versions available are retrieved and upgraded; under no " +"circumstances are currently installed packages removed, or packages not " +"already installed retrieved and installed. New versions of currently " +"installed packages that cannot be upgraded without changing the install " +"status of another package will be left at their current version. An " +"<literal>update</literal> must be performed first so that <command>apt-get</" +"command> knows that new versions of packages are available." +msgstr "" +"<literal>upgrade</literal> wird benutzt, um die neusten Versionen aller " +"aktuell auf dem System installierten Pakete aus den in <filename>/etc/apt/" +"sources.list</filename> aufgez??hlten Quellen zu installieren. Aktuell " +"installierte Pakete mit verf??gbaren neuen Versionen werden heruntergeladen " +"und das Upgrade durchgef??hrt. Unter keinen Umst??nden werden derzeit " +"installierte Pakete entfernt oder nicht installierte Pakete heruntergeladen " +"und installiert. Neue Versionen von aktuell installierten Paketen von denen " +"kein Upgrade durchgef??hrt werden kann, ohne den Installationsstatus eines " +"anderen Paketes zu ??ndern, werden in ihrer aktuellen Version bleiben. " +"Zuerst muss ein <literal>update</literal> durchgef??hrt werden, so dass " +"<command>apt-get</command> die neuen Versionen der verf??gbaren Pakete kennt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:160 +msgid "dselect-upgrade" +msgstr "dselect-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:161 +msgid "" +"<literal>dselect-upgrade</literal> is used in conjunction with the " +"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" +"literal> follows the changes made by &dselect; to the <literal>Status</" +"literal> field of available packages, and performs the actions necessary to " +"realize that state (for instance, the removal of old and the installation of " +"new packages)." +msgstr "" +"<literal>dselect-upgrade</literal> wird zusammen mit der traditionellen " +"Debian-Oberfl??che &dselect; benutzt. <literal>dselect-upgrade</literal> " +"folgt den durch &dselect; am <literal>Status</literal>-Feld verf??gbarer " +"Pakete gemachten ??nderungen und f??hrt die notwendigen Aktionen durch, um " +"diesen Status zu realisieren (zum Beispiel das Entfernen von alten und " +"Installieren von neuen Paketen)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:170 +msgid "dist-upgrade" +msgstr "dist-upgrade" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:171 +msgid "" +"<literal>dist-upgrade</literal> in addition to performing the function of " +"<literal>upgrade</literal>, also intelligently handles changing dependencies " +"with new versions of packages; <command>apt-get</command> has a \"smart\" " +"conflict resolution system, and it will attempt to upgrade the most " +"important packages at the expense of less important ones if necessary. So, " +"<literal>dist-upgrade</literal> command may remove some packages. The " +"<filename>/etc/apt/sources.list</filename> file contains a list of locations " +"from which to retrieve desired package files. See also &apt-preferences; " +"for a mechanism for overriding the general settings for individual packages." +msgstr "" +"<literal>dist-upgrade</literal> f??hrt zus??tzlich zu der Funktion von " +"<literal>upgrade</literal> intelligente Handhabung von Abh??ngigkeits??" +"nderungen mit neuen Versionen von Paketen durch. <command>apt-get</command> " +"hat ein ??intelligentes?? Konfliktaufl??sungssystem und es wird versuchen, " +"Upgrades der wichtigsten Pakete, wenn n??tig zu Lasten der weniger " +"wichtigen, zu machen. So k??nnte der <literal>dist-upgrade</literal>-Befehl " +"einige Pakete entfernen. Die <filename>/etc/apt/sources.list</filename>-" +"Datei enth??lt eine Liste mit Orten, von denen gew??nschte Paketdateien " +"abgerufen werden. Siehe auch &apt-preferences; f??r einen Mechanismus zum ??" +"berschreiben der allgemeinen Einstellungen f??r einzelne Pakete." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:183 +msgid "install" +msgstr "install" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:185 +msgid "" +"<literal>install</literal> is followed by one or more packages desired for " +"installation or upgrading. Each package is a package name, not a fully " +"qualified filename (for instance, in a Debian GNU/Linux system, libc6 would " +"be the argument provided, not <literal>libc6_1.9.6-2.deb</literal>). All " +"packages required by the package(s) specified for installation will also be " +"retrieved and installed. The <filename>/etc/apt/sources.list</filename> " +"file is used to locate the desired packages. If a hyphen is appended to the " +"package name (with no intervening space), the identified package will be " +"removed if it is installed. Similarly a plus sign can be used to designate " +"a package to install. These latter features may be used to override " +"decisions made by apt-get's conflict resolution system." +msgstr "" +"<literal>install</literal> wird gefolgt von einem oder mehreren gew??nschten " +"Paketen zur Installation oder zum Upgrade. Jedes Paket ist ein Paketname, " +"kein vollst??ndig zusammengesetzter Dateiname (zum Beispiel w??re in einem ??" +"Debian GNU/Linux??-System libc6 das bereitgestellte Argument, nicht " +"<literal>libc6_1.9.6-2.deb</literal>). Alle von den zur Installation " +"angegebenen Paketen ben??tigten Pakete werden zus??tzlich heruntergeladen " +"und installiert. Die <filename>/etc/apt/sources.list</filename>-Datei wird " +"benutzt, um die gew??nschten Pakete zu finden. Wenn ein Bindestrich an den " +"Paketnamen (ohne Leerzeichen dazwischen) angeh??ngt ist, wird das erkannte " +"Pakete entfernt, falls es installiert ist. ??hnlich kann ein Pluszeichen " +"benutzt werden, um ein Paket zum Installieren vorzumerken. Diese letzteren " +"Funktionen k??nnen benutzt werden, um Entscheidungen zu ??berschreiben, die " +"vom Konfliktaufl??sungssystem von apt-get getroffen wurden." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:203 +msgid "" +"A specific version of a package can be selected for installation by " +"following the package name with an equals and the version of the package to " +"select. This will cause that version to be located and selected for install. " +"Alternatively a specific distribution can be selected by following the " +"package name with a slash and the version of the distribution or the Archive " +"name (stable, testing, unstable)." +msgstr "" +"Eine bestimmte Version eines Paketes kann durch den Paketnamen gefolgt von " +"einem Gleichheitszeichen und der Version des Paketes zur Installation " +"ausgew??hlt werden. Dies bewirkt, dass diese Version gesucht und zum " +"Installieren ausgew??hlt wird. Alternativ kann eine bestimmte Distribution " +"durch den Paketnamen gefolgt von einem Schr??gstrich und der Version der " +"Distribution oder des Archivnamens (stable, testing, unstable) ausgew??hlt " +"werden." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:210 +msgid "" +"Both of the version selection mechanisms can downgrade packages and must be " +"used with care." +msgstr "" +"Beide Mechanismen der Versionsauswahl k??nnen ein Downgrade von Paketen " +"durchf??hren und m??ssen mit Vorsicht gehandhabt werden." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:213 +msgid "" +"This is also the target to use if you want to upgrade one or more already-" +"installed packages without upgrading every package you have on your system. " +"Unlike the \"upgrade\" target, which installs the newest version of all " +"currently installed packages, \"install\" will install the newest version of " +"only the package(s) specified. Simply provide the name of the package(s) " +"you wish to upgrade, and if a newer version is available, it (and its " +"dependencies, as described above) will be downloaded and installed." +msgstr "" +"Dies ist au??erdem die bevorzugt zu benutzende Art, wenn Sie Sie ein Upgrade " +"eines oder mehrerer bereits installierter Pakete durchf??hren m??chten, ohne " +"ein Upgrade aller Pakete, die Sie auf Ihrem System haben, durchzuf??hren. " +"Anders als das Ziel von ??upgrade??, das die neusten Versionen aller aktuell " +"installierten Pakete installiert, wird ??install?? nur die neusten Versionen " +"der angegebenen Pakete installieren. Geben Sie einfach den Namen des Paketes " +"an, von dem Sie ein Upgrade durchf??hren m??chten und wenn eine neuere " +"Version verf??gbar ist, wird sie (und ihre Abh??ngigkeiten, wie oben " +"beschrieben) heruntergeladen und installiert." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:224 +msgid "" +"Finally, the &apt-preferences; mechanism allows you to create an alternative " +"installation policy for individual packages." +msgstr "" +"Letztendlich erlaubt Ihnen der &apt-preferences;-Mechanismus eine " +"alternative Installationsrichtlinie f??r eigene Pakete zu erzeugen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:228 +msgid "" +"If no package matches the given expression and the expression contains one " +"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " +"it is applied to all package names in the database. Any matches are then " +"installed (or removed). Note that matching is done by substring so 'lo.*' " +"matches 'how-lo' and 'lowest'. If this is undesired, anchor the regular " +"expression with a '^' or '$' character, or create a more specific regular " +"expression." +msgstr "" +"Wenn keine Pakete dem angegebenen Ausdruck entsprechen und der Ausdruck " +"entweder ??.??,??,??,????? oder ??*?? enth??lt, dann wird vermutet, dass es " +"sich um einen regul??ren POSIX-Ausdruck handelt und er wird auf alle " +"Paketnamen in der Datenbank angewandt. Jeder Treffer wird dann installiert " +"(oder entfernt). Beachten Sie, dass nach ??bereinstimmenden " +"Zeichenkettenteilen gesucht wird, so dass ??lo.*?? auf ??how-lo?? und ??" +"lowest?? passt. Wenn dies nicht gew??nscht wird, h??ngen Sie an den regul??" +"ren Ausdruck ein ??^??- oder ??$??-Zeichen, um genauere regul??re Ausdruck " +"zu erstellen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:237 +msgid "remove" +msgstr "remove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:238 +msgid "" +"<literal>remove</literal> is identical to <literal>install</literal> except " +"that packages are removed instead of installed. Note the removing a package " +"leaves its configuration files in system. If a plus sign is appended to the " +"package name (with no intervening space), the identified package will be " +"installed instead of removed." +msgstr "" +"<literal>remove</literal> ist identisch mit <literal>install</literal>, mit " +"der Ausnahme, dass Pakte entfernt anstatt installiert werden. Beachten Sie, " +"dass das Entfernen von Paketen deren Konfigurationsdateien im System bel??" +"sst. Wenn ein Pluszeichen an den Paketnamen angeh??ngt wird (ohne " +"Leerzeichen dazwischen) wird das erkannte Paket installiert anstatt entfernt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:245 +msgid "purge" +msgstr "purge" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:246 +msgid "" +"<literal>purge</literal> is identical to <literal>remove</literal> except " +"that packages are removed and purged (any configuration files are deleted " +"too)." +msgstr "" +"<literal>purge</literal> entspricht <literal>remove</literal> mit der " +"Ausnahme, dass Pakete entfernt und vollst??ndig gel??scht werden (jegliche " +"Konfigurationsdateien werden mitgel??scht)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:250 +msgid "source" +msgstr "source" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:251 +msgid "" +"<literal>source</literal> causes <command>apt-get</command> to fetch source " +"packages. APT will examine the available packages to decide which source " +"package to fetch. It will then find and download into the current directory " +"the newest available version of that source package while respect the " +"default release, set with the option <literal>APT::Default-Release</" +"literal>, the <option>-t</option> option or per package with with the " +"<literal>pkg/release</literal> syntax, if possible." +msgstr "" +"<literal>source</literal> veranlasst <command>apt-get</command> dazu, " +"Paketquellen zu laden. APT wird die verf??gbaren Pakete ??berpr??fen, um zu " +"entscheiden, welche Paketquellen geladen werden. Es wird dann die neueste " +"Version der Paketquelle finden und in das aktuelle Verzeichnis " +"herunterladen. Dabei ber??cksichtigt es das Vorgabe-Release, das mit der " +"Option <literal>APT::Default-Release</literal>, der Option <option>-t</" +"option> oder pro Paket mit der <literal>pkg/release</literal>-Syntax gesetzt " +"wurde, wenn m??glich." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:259 +msgid "" +"Source packages are tracked separately from binary packages via <literal>deb-" +"src</literal> type lines in the &sources-list; file. This means that you " +"will need to add such a line for each repository you want to get sources " +"from. If you don't do this you will properly get another (newer, older or " +"none) source version than the one you have installed or could install." +msgstr "" +"Paketquellen werden von Programmpaket getrennt ??ber <literal>deb-src</" +"literal>-Typzeilen in der &sources-list;-Datei nachverfolgt. Das bedeutet, " +"dass Sie f??r jedes Depot, aus dem Sie Quellen erhalten wollen, eine solche " +"Zeile hinzuf??gen m??ssen. Wenn Sie dies nicht tun, werden Sie eine andere " +"als die passende (neuere, ??ltere oder keine) Quellenversion erhalten, die " +"Sie installiert haben oder installieren k??nnten." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:266 +msgid "" +"If the <option>--compile</option> options is specified then the package will " +"be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " +"<option>--download-only</option> is specified then the source package will " +"not be unpacked." +msgstr "" +"Wenn die <option>--compile</option>-Option angegeben ist, dann wird das " +"Paket unter Benutzung von <command>dpkg-buildpackage</command> zu einem bin??" +"ren .deb kompiliert, wenn <option>--download-only</option> angegeben ist, " +"wird das Quellpaket nicht entpackt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:271 +msgid "" +"A specific source version can be retrieved by postfixing the source name " +"with an equals and then the version to fetch, similar to the mechanism used " +"for the package files. This enables exact matching of the source package " +"name and version, implicitly enabling the <literal>APT::Get::Only-Source</" +"literal> option." +msgstr "" +"Eine bestimmte Quellversion kann durch Voranstellen eines " +"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</literal>-Option." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:277 +msgid "" +"Note that source packages are not tracked like binary packages, they exist " +"only in the current directory and are similar to downloading source tar " +"balls." +msgstr "" +"Beachten Sie, dass Quellpakete nicht wie normale Programmpakete nachverfolgt " +"werden, sie existieren nur im aktuellen Verzeichnis und sind " +"heruntergeladenen Tarballs ??hnlich." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:282 +msgid "build-dep" +msgstr "build-dep" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:283 +msgid "" +"<literal>build-dep</literal> causes apt-get to install/remove packages in an " +"attempt to satisfy the build dependencies for a source package." +msgstr "" +"<literal>build-dep</literal> veranlasst apt-get, Pakete zu installieren/" +"entfernen, um zu versuchen, die Bauabh??ngigkeiten eines Quellpakets zu erf??" +"llen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:287 +msgid "check" +msgstr "check" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:288 +msgid "" +"<literal>check</literal> is a diagnostic tool; it updates the package cache " +"and checks for broken dependencies." +msgstr "" +"<literal>check</literal> ist ein Diagnosewerkzeug. Es aktualisiert den " +"Paketzwischenspeicher und pr??ft, ob besch??digte Abh??ngigkeiten vorliegen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:293 +msgid "" +"<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 <filename>&cachedir;/archives/" +"partial/</filename>. When APT is used as a &dselect; method, <literal>clean</" +"literal> is run automatically. Those who do not use dselect will likely " +"want to run <literal>apt-get clean</literal> from time to time to free up " +"disk space." +msgstr "" +"<literal>clean</literal> bereinigt das lokale Depot von heruntergeladenen " +"Paketdateien. Es entfernt alles au??er der Sperrdatei aus " +"<filename>&cachedir;/archives/</filename> und <filename>&cachedir;/archives/" +"partial/</filename>. Wenn APT als eine &dselect;-Methode benutzt wird, wird " +"<literal>clean</literal> automatisch ausgef??hrt. Diejenigen, die Dselect " +"nicht benutzen, werden <literal>apt-get clean</literal> wahrscheinlich von " +"Zeit zu Zeit ausf??hren, um Plattenplatz freizugeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:302 +msgid "autoclean" +msgstr "autoclean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:303 +msgid "" +"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 " +"useless. This allows a cache to be maintained over a long period without it " +"growing out of control. The configuration option <literal>APT::Clean-" +"Installed</literal> will prevent installed packages from being erased if it " +"is set to off." +msgstr "" +"Wie <literal>clean</literal> bereinigt <literal>autoclean</literal> das " +"lokale Depot von heruntergeladenen Paketdateien. Der Unterschied besteht " +"darin, dass es nur Pakete entfernt, die nicht mehr heruntergeladen werden k??" +"nnen und gr????tenteils nutzlos sind. Dies erlaubt es, einen " +"Zwischenspeicher ??ber eine lange Zeitspanne zu betreuen, ohne dass er " +"unkontrolliert anw??chst. Die Konfigurationsoption <literal>APT::Clean-" +"Installed</literal> wird installierte Pakete vor der L??schung bewahren, " +"wenn sie auf off gesetzt ist." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:312 +msgid "autoremove" +msgstr "autoremove" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:313 +msgid "" +"<literal>autoremove</literal> is used to remove packages that were " +"automatically installed to satisfy dependencies for some package and that " +"are no more needed." +msgstr "" +"<literal>autoremove</literal> wird benutzt, um Pakete, die automatisch " +"installiert wurden, um Abh??ngigkeiten f??r einige Pakete zu erf??llen und " +"und die nicht mehr ben??tigt werden, zu entfernen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:323 apt-get.8.xml:429 +msgid "<option>--no-install-recommends</option>" +msgstr "<option>--no-install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:324 +msgid "" +"Do not consider recommended packages as a dependency for installing. " +"Configuration Item: <literal>APT::Install-Recommends</literal>." +msgstr "" +"Empfohlene Pakete nicht als Abh??ngigkeit f??r die Installation betrachten. " +"Konfigurationselement: <literal>APT::Install-Recommends</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:328 +msgid "<option>--download-only</option>" +msgstr "<option>--download-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:329 +msgid "" +"Download only; package files are only retrieved, not unpacked or installed. " +"Configuration Item: <literal>APT::Get::Download-Only</literal>." +msgstr "" +"Nur herunterladen; Paketdateien werde nur heruntergeladen, nicht entpackt " +"oder installiert. Konfigurationselement: <literal>APT::Get::Download-Only</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:333 +msgid "<option>--fix-broken</option>" +msgstr "<option>--fix-broken</option>" + +# s/Any Package that are specified/Any package that is specified/ +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:334 +msgid "" +"Fix; attempt to correct a system with broken dependencies in place. This " +"option, when used with install/remove, can omit any packages to permit APT " +"to deduce a likely solution. Any Package that are specified must completely " +"correct the problem. The option is sometimes necessary when running APT for " +"the first time; APT itself does not allow broken package dependencies to " +"exist on a system. It is possible that a system's dependency structure can " +"be so corrupt as to require manual intervention (which usually means using " +"&dselect; or <command>dpkg --remove</command> to eliminate some of the " +"offending packages). Use of this option together with <option>-m</option> " +"may produce an error in some situations. Configuration Item: <literal>APT::" +"Get::Fix-Broken</literal>." +msgstr "" +"Beheben; Versucht ein System von vorhandenen besch??digten Abh??ngigkeiten " +"zu korrigieren. Diese Option kann, wenn sie mit install/remove benutzt wird, " +"einige Pakete weglassen, um es APT zu erlauben, eine wahrscheinliche L??sung " +"herzuleiten. Jedes Paket, das angegeben ist, muss das Problem vollst??ndig " +"korrigieren. Die Option ist manchmal n??tig, wenn APT zum ersten Mal ausgef??" +"hrt wird. APT selbst erlaubt es nicht, dass auf einen System besch??digte " +"Paketabh??ngigkeiten existieren. Es ist m??glich, dass eine Abh??" +"ngigkeitsstruktur eines Systems so fehlerhaft ist, dass ein manuelles " +"Eingreifen erforderlich ist (was normalerweise bedeutet, dass &dselect; oder " +"<command>dpkg --remove</command> benutzt wird, um einige der fehlerhaften " +"Pakete zu beseitigen). Wenn Sie die Option zusammen mit <option>-m</option> " +"benutzen, k??nnte das in einigen Situationen zu Fehlern f??hren. " +"Konfigurationselement: <literal>APT::Get::Fix-Broken</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:347 +msgid "<option>--ignore-missing</option>" +msgstr "<option>--ignore-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:348 +msgid "<option>--fix-missing</option>" +msgstr "<option>--fix-missing</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:349 +msgid "" +"Ignore missing packages; If packages cannot be retrieved or fail the " +"integrity check after retrieval (corrupted package files), hold back those " +"packages and handle the result. Use of this option together with <option>-f</" +"option> may produce an error in some situations. If a package is selected " +"for installation (particularly if it is mentioned on the command line) and " +"it could not be downloaded then it will be silently held back. " +"Configuration Item: <literal>APT::Get::Fix-Missing</literal>." +msgstr "" +"Fehlende Pakete ignorieren; Wenn Pakete nicht heruntergeladen werden k??nnen " +"oder die Integrit??tspr??fung nach dem Herunterladen fehlschl??gt " +"(fehlerhafte Paketdateien), werden diese Pakete zur??ckgehalten und das " +"Ergebnis verarbeitet. Die Benutzung dieser Option zusammen mit <option>-f</" +"option> kann in einigen Situationen zu Fehlern f??hren. Wenn ein Paket zur " +"Installation ausgew??hlt ist (besonders, wenn es auf der Befehlszeile " +"genannt wurde) und es nicht heruntergeladen werden kann, wird es " +"stillschweigend zur??ckgehalten. Konfigurationselement: <literal>APT::Get::" +"Fix-Missing</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:359 +msgid "<option>--no-download</option>" +msgstr "<option>--no-download</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:360 +msgid "" +"Disables downloading of packages. This is best used with <option>--ignore-" +"missing</option> to force APT to use only the .debs it has already " +"downloaded. Configuration Item: <literal>APT::Get::Download</literal>." +msgstr "" +"Schaltet das Herunterladen von Paketen aus. Dies wird am besten mit " +"<option>--ignore-missing</option> benutzt, um APT zu zwingen, nur die .debs " +"zu benutzten, die es bereits heruntergeladenen hat. Konfigurationselement: " +"<literal>APT::Get::Download</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:367 +msgid "" +"Quiet; produces output suitable for logging, omitting progress indicators. " +"More q's will produce more quiet up to a maximum of 2. You can also use " +"<option>-q=#</option> to set the quiet level, overriding the configuration " +"file. Note that quiet level 2 implies <option>-y</option>, you should never " +"use -qq without a no-action modifier such as -d, --print-uris or -s as APT " +"may decided to do something you did not expect. Configuration Item: " +"<literal>quiet</literal>." +msgstr "" +"Still; erzeugt eine Ausgabe, die f??r Protokollierung geeignet ist und " +"Fortschrittsanzeiger wegl??sst. Mehr ??q??s unterdr??cken mehr Ausgaben, bis " +"zu einem Maximum von 2. Sie k??nnen au??erdem <option>-q=#</option> " +"benutzen, um die Stillestufe zu setzen, was die Konfigurationsdatei ??" +"berschreibt. Beachten Sie, dass Stillestufe 2 <option>-y</option> " +"impliziert. Sie sollten niemals -qq ohne einen keine-Aktion-Umwandler, wie -" +"d, --print-uris oder -s benutzen, da APT entscheiden k??nnte, etwas zu tun, " +"das Sie nicht erwarten. Konfigurationselement: <literal>quiet</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:377 +msgid "<option>--simulate</option>" +msgstr "<option>--simulate</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:379 +msgid "<option>--dry-run</option>" +msgstr "<option>--dry-run</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:382 +msgid "" +"No action; perform a simulation of events that would occur but do not " +"actually change the system. Configuration Item: <literal>APT::Get::" +"Simulate</literal>." +msgstr "" +"Keine Aktion; f??hrt eine Simulation von Ereignissen aus, die eintreten w??" +"rden, aber das aktuelle System nicht ver??ndern. Konfigurationselement: " +"<literal>APT::Get::Simulate</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:386 +msgid "" +"Simulation run as user will deactivate locking (<literal>Debug::NoLocking</" +"literal>) automatic. Also a notice will be displayed indicating that this " +"is only a simulation, if the option <literal>APT::Get::Show-User-Simulation-" +"Note</literal> is set (Default: true). Neither NoLocking nor the notice " +"will be triggered if run as root (root should know what he is doing without " +"further warnings by <literal>apt-get</literal>)." +msgstr "" +"Ausf??hrung der Simulation als normaler Anwender wird das Sperren " +"(<literal>Debug::NoLocking</literal>) automatisch deaktivieren. Au??erdem " +"wird eine Mitteilung angezeigt, die angibt, dass dies nur eine Simulation " +"ist, wenn die Option <literal>APT::Get::Show-User-Simulation-Note</literal> " +"gesetzt ist (Vorgabe ist true). Weder NoLocking noch die Mitteilung werden " +"ausgel??st, wenn es als root ausgef??hrt wird (root sollte ohne weitere " +"Warnungen von <literal>apt-get</literal> wissen, was er tut)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:392 +msgid "" +"Simulate prints out a series of lines each one representing a dpkg " +"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " +"indicate broken packages with and empty set of square brackets meaning " +"breaks that are of no consequence (rare)." +msgstr "" +"Simulieren gibt eine Serie von Zeilen aus, von denen jede eine Dpkg-" +"Operation darstellt: Konfigurieren (Conf), Entfernen (Remv), Entpacken " +"(Inst). Eckige Klammern zeigen besch??digte Pakete an und ein leeres Paar " +"eckiger Klammern bedeutet Unterbrechungen, die keine Folgen haben (selten)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>-y</option>" +msgstr "<option>-y</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:399 +msgid "<option>--yes</option>" +msgstr "<option>--yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:400 +msgid "<option>--assume-yes</option>" +msgstr "<option>--assume-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:401 +msgid "" +"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " +"non-interactively. If an undesirable situation, such as changing a held " +"package, trying to install a unauthenticated package or removing an " +"essential package occurs then <literal>apt-get</literal> will abort. " +"Configuration Item: <literal>APT::Get::Assume-Yes</literal>." +msgstr "" +"Automatisches ??Ja?? auf Anfragen; Versucht ??Ja?? auf alle Anfragen zu " +"antworten und ohne Eingaben zu laufen. Wenn eine unerw??nschte Situation " +"eintritt, wie ein gehaltenes Paket zu ??ndern, ein nicht authentifiziert " +"Paket zu installieren oder ein essentielles Paket zu entfernen, dann wird " +"<literal>apt-get</literal> abgebrochen. Konfigurationselement: <literal>APT::" +"Get::Assume-Yes</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:408 +msgid "<option>-u</option>" +msgstr "<option>-u</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:408 +msgid "<option>--show-upgraded</option>" +msgstr "<option>--show-upgraded</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:409 +msgid "" +"Show upgraded packages; Print out a list of all packages that are to be " +"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." +msgstr "" +"Zeigt Pakete, von denen ein Upgrade durchgef??hrt werden soll; Gibt eine " +"Liste aller Pakete aus, von denen ein Upgrade gemacht wurde. " +"Konfigurationselement: <literal>APT::Get::Show-Upgraded</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:414 +msgid "<option>-V</option>" +msgstr "<option>-V</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:414 +msgid "<option>--verbose-versions</option>" +msgstr "<option>--verbose-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:415 +msgid "" +"Show full versions for upgraded and installed packages. Configuration Item: " +"<literal>APT::Get::Show-Versions</literal>." +msgstr "" +"Zeigt vollst??ndige Versionen f??r Pakete, von denen ein Upgrade durchgef??" +"hrt oder die installiert wurden. Konfigurationselement: <literal>APT::Get::" +"Show-Versions</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:419 +msgid "<option>-b</option>" +msgstr "<option>-b</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:419 +msgid "<option>--compile</option>" +msgstr "<option>--compile</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:420 +msgid "<option>--build</option>" +msgstr "<option>--build</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:421 +msgid "" +"Compile source packages after downloading them. Configuration Item: " +"<literal>APT::Get::Compile</literal>." +msgstr "" +"Kompiliert Quellpakete, nachdem sie heruntergeladen wurden. " +"Konfigurationselement: <literal>APT::Get::Compile</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:425 +msgid "<option>--install-recommends</option>" +msgstr "<option>--install-recommends</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:426 +msgid "Also install recommended packages." +msgstr "Installiert au??erdem empfohlene Pakete." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:430 +msgid "Do not install recommended packages." +msgstr "Keine empfohlenen Pakete installieren." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:433 +msgid "<option>--ignore-hold</option>" +msgstr "<option>--ignore-hold</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:434 +msgid "" +"Ignore package Holds; This causes <command>apt-get</command> to ignore a " +"hold placed on a package. This may be useful in conjunction with " +"<literal>dist-upgrade</literal> to override a large number of undesired " +"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." +msgstr "" +"Ignoriert zur??ckhalten des Paketes; Dies veranlasst <command>apt-get</" +"command>, ein f??r das Paket gesetztes ??Halten?? zu ignorieren. Dies kann " +"zusammen mit <literal>dist-upgrade</literal> n??tzlich sein, um eine gro??e " +"Anzahl ungew??nschter ??Halten?? zu ??berschreiben. Konfigurationselement: " +"<literal>APT::Ignore-Hold</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:440 +msgid "<option>--no-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:441 +msgid "" +"Do not upgrade packages; When used in conjunction with <literal>install</" +"literal>, <literal>no-upgrade</literal> will prevent packages on the command " +"line from being upgraded if they are already installed. Configuration Item: " +"<literal>APT::Get::Upgrade</literal>." +msgstr "" +"Kein Upgrade von Paketen durchf??hren; Wenn es zusammen mit " +"<literal>install</literal> benutzt wird, wird <literal>no-upgrade</literal> " +"auf der Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits " +"installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:447 +msgid "<option>--force-yes</option>" +msgstr "<option>--force-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:448 +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 " +"not be used except in very special situations. Using <literal>force-yes</" +"literal> can potentially destroy your system! Configuration Item: " +"<literal>APT::Get::force-yes</literal>." +msgstr "" +"??Ja?? erzwingen; Dies ist eine gef??hrliche Option, die APT veranlasst, " +"ohne Nachfrage fortzufahren, wenn es etwas m??glicherweise sch??dliches tut. " +"Es sollte nicht benutzt werden, au??er in ganz besonderen Situationen. " +"<literal>force-yes</literal> zu benutzen, kann m??glicherweise ihr System " +"zerst??ren! Konfigurationselement: <literal>APT::Get::force-yes</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:455 +msgid "<option>--print-uris</option>" +msgstr "<option>--print-uris</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:456 +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 " +"hash. Note that the file name to write to will not always match the file " +"name on the remote site! This also works with the <literal>source</literal> " +"and <literal>update</literal> commands. When used with the <literal>update</" +"literal> command the MD5 and size are not included, and it is up to the user " +"to decompress any compressed files. Configuration Item: <literal>APT::Get::" +"Print-URIs</literal>." +msgstr "" +"Anstatt die Dateien herunterzuladen, werden ihre URIs ausgegeben. Jede URI " +"wird den Pfad, den Zieldateinamen, die Gr????e und den erwarteten md5-Hash " +"enthalten. Beachten Sie, dass der zu schreibende Dateiname nicht immer dem " +"Dateinamen auf der entfernt gelegenen Seite entspricht. Dies funktioniert " +"auch mit den Befehlen <literal>source</literal> und <literal>update</" +"literal>. Wenn es mit dem Befehl <literal>update</literal> benutzt wird, " +"sind MD5 und Gr????e nicht enthalten und es ist Aufgabe des Benutzers, " +"komprimierte Dateien zu dekomprimieren. Konfigurationselement: <literal>APT::" +"Get::Print-URIs</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:466 +msgid "<option>--purge</option>" +msgstr "<option>--purge</option>" + +# s/equivalent for/equivalent to the/ +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:467 +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. " +"<option>remove --purge</option> is equivalent for <option>purge</option> " +"command. Configuration Item: <literal>APT::Get::Purge</literal>." +msgstr "" +"??remove?? ??purge?? f??r alles zu entfernende benutzen. Ein Stern (??*??) " +"wird bei Paketen angezeigt, die zum vollst??ndigen Entfernen vorgemerkt " +"sind. <option>remove --purge</option> entspricht dem Befehl <option>purge</" +"option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:474 +msgid "<option>--reinstall</option>" +msgstr "<option>--reinstall</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:475 +msgid "" +"Re-Install packages that are already installed and at the newest version. " +"Configuration Item: <literal>APT::Get::ReInstall</literal>." +msgstr "" +"Paket erneut installieren, die bereits installiert und in der neuesten " +"Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:479 +msgid "<option>--list-cleanup</option>" +msgstr "<option>--list-cleanup</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:480 +msgid "" +"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " +"it off. When on <command>apt-get</command> will automatically manage the " +"contents of <filename>&statedir;/lists</filename> to ensure that obsolete " +"files are erased. The only reason to turn it off is if you frequently " +"change your source list. Configuration Item: <literal>APT::Get::List-" +"Cleanup</literal>." +msgstr "" +"Diese Option ist standardm????ig eingeschaltet. Um sie auszuschalten, " +"benutzen Sie <literal>--no-list-cleanup</literal>. Wenn eingeschaltet, wird " +"<command>apt-get</command> den Inhalt von <filename>&statedir;/lists</" +"filename> automatisch verwalten, um sicherzustellen, dass veraltete Dateien " +"gel??scht werden. Nur das h??ufige ??ndern der Quelllisten stellt den " +"einzigen Grund zum Ausschalten der Option dar.Konfigurationselement: " +"<literal>APT::Get::List-Cleanup</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:489 +msgid "<option>--target-release</option>" +msgstr "<option>--target-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:490 +msgid "<option>--default-release</option>" +msgstr "<option>--default-release</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:491 +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 " +"overrides the general settings in <filename>/etc/apt/preferences</" +"filename>. Specifically pinned packages are not affected by the value of " +"this option. In short, this option lets you have simple control over which " +"distribution packages will be retrieved from. Some common examples might be " +"<option>-t '2.1*'</option>, <option>-t unstable</option> or <option>-t sid</" +"option>. Configuration Item: <literal>APT::Default-Release</literal>; see " +"also the &apt-preferences; manual page." +msgstr "" +"Diese Option steuert die standardm????ige Eingabe an die Einheit zur " +"Durchsetzung der Richtlinien (??policy??), sie erstellt eine Vorgabe-Pin mit " +"Priorit??t 990 unter Benutzung der angegebenen Release-Zeichenkette. Dies ??" +"berschreibt die allgemeinen Einstellungen in <filename>/etc/apt/preferences</" +"filename>. Pakete mit speziellem Pinning sind nicht vom Wert dieser Option " +"betroffen. Kurz gesagt, gibt Ihnen diese Option einfache Kontrolle dar??ber, " +"welche Distributions-Pakete heruntergeladen werden sollen. Einige typische " +"Beispiele k??nnten <option>-t '2.1*'</option>, <option>-t unstable</option> " +"oder <option>-t sid</option> sein. Konfigurationselement: <literal>APT::" +"Default-Release</literal>; Lesen Sie auch die &apt-preferences;-" +"Handbuchseite." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:504 +msgid "<option>--trivial-only</option>" +msgstr "<option>--trivial-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:506 +msgid "" +"Only perform operations that are 'trivial'. Logically this can be considered " +"related to <option>--assume-yes</option>, where <option>--assume-yes</" +"option> will answer yes to any prompt, <option>--trivial-only</option> will " +"answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." +msgstr "" +"Nur Operationen ausf??hren, die ??trivial?? sind. Logischerweise kann dies " +"in Betracht bezogen auf <option>--assume-yes</option> sein, wobei <option>--" +"assume-yes</option> auf jede Frage mit ??Ja?? und <option>--trivial-only</" +"option> mit ??Nein?? antworten wird. Konfigurationselement: <literal>APT::" +"Get::Trivial-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:512 +msgid "<option>--no-remove</option>" +msgstr "<option>--no-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:513 +msgid "" +"If any packages are to be removed apt-get immediately aborts without " +"prompting. Configuration Item: <literal>APT::Get::Remove</literal>." +msgstr "" +"Wenn irgendwelche Pakete entfernt werden sollen, bricht apt-get sofort ohne " +"Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:518 +msgid "<option>--auto-remove</option>" +msgstr "<option>--auto-remove</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:519 +msgid "" +"If the command is either <literal>install</literal> or <literal>remove</" +"literal>, then this option acts like running <literal>autoremove</literal> " +"command, removing the unused dependency packages. Configuration Item: " +"<literal>APT::Get::AutomaticRemove</literal>." +msgstr "" +"Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</" +"literal> lautet, dann bewirkt diese Option wie das Ausf??hren des " +"<literal>autoremove</literal>-Befehls das Entfernen der nicht benutzten " +"Abhh??ngigkeitspakete. Konfigurationselement: <literal>APT::Get::" +"AutomaticRemove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:525 +msgid "<option>--only-source</option>" +msgstr "<option>--only-source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:526 +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 " +"mapped through the binary table. This means that if this option is " +"specified, these commands will only accept source package names as " +"arguments, rather than accepting binary package names and looking up the " +"corresponding source package. Configuration Item: <literal>APT::Get::Only-" +"Source</literal>." +msgstr "" +"Hat nur eine Bedeutung f??r die Befehle <literal>source</literal> und " +"<literal>build-dep</literal>. Zeigt an, dass die angegebenen Quellnamen " +"nicht durch die Programmtabelle ermittelt werden. Dies bedeutet, das dieser " +"Befehl, wenn diese Option angegeben ist, nur Quellpaketnamen als Argumente " +"akzeptiert, anstatt Programmpakete zu akzeptieren und nach den " +"entsprechenden Quellpaketen zu suchen. Konfigurationselement: <literal>APT::" +"Get::Only-Source</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:536 +msgid "<option>--diff-only</option>" +msgstr "<option>--diff-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:536 +msgid "<option>--dsc-only</option>" +msgstr "<option>--dsc-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:536 +msgid "<option>--tar-only</option>" +msgstr "<option>--tar-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:537 +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</" +"literal>, and <literal>APT::Get::Tar-Only</literal>." +msgstr "" +"Nur die diff-, dsc-, oder tar-Dateien eines Quellarchivs herunterladen. " +"Konfigurationselemente: <literal>APT::Get::Diff-Only</literal>, " +"<literal>APT::Get::Dsc-Only</literal> und <literal>APT::Get::Tar-Only</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:542 +msgid "<option>--arch-only</option>" +msgstr "<option>--arch-only</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:543 +msgid "" +"Only process architecture-dependent build-dependencies. Configuration Item: " +"<literal>APT::Get::Arch-Only</literal>." +msgstr "" +"Nur architekturabh??ngige Bauabh??ngigkeiten verarbeiten. " +"Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:547 +msgid "<option>--allow-unauthenticated</option>" +msgstr "<option>--allow-unauthenticated</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:548 +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::" +"AllowUnauthenticated</literal>." +msgstr "" +"Ignorieren, wenn Pakete nicht authentifiziert werden k??nnen und nicht " +"danach fragen. Dies ist f??r Werkzeuge wie pbuilder n??tzlich. " +"Konfigurationselement: <literal>APT::Get::AllowUnauthenticated</literal>." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt-get.8.xml:561 +msgid "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" +msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:570 +msgid "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" +"preferences;, the APT Howto." +msgstr "" +"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " +"&apt-config;, &apt-secure;, Die APT-Benutzeranleitung in &guidesdir;, &apt-" +"preferences;, das APT-Howto." + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:576 +msgid "" +"<command>apt-get</command> returns zero on normal operation, decimal 100 on " +"error." +msgstr "" +"<command>apt-get</command> gibt bei normalen Operationen 0 zur??ck, dezimal " +"100 bei Fehlern." + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:579 +msgid "ORIGINAL AUTHORS" +msgstr "ORIGINALAUTOREN" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:580 +msgid "&apt-author.jgunthorpe;" +msgstr "&apt-author.jgunthorpe;" + +#. type: Content of: <refentry><refsect1><title> +#: apt-get.8.xml:583 +msgid "CURRENT AUTHORS" +msgstr "AKTUELLE AUTOREN" + +#. type: Content of: <refentry><refsect1><para> +#: apt-get.8.xml:585 +msgid "&apt-author.team;" +msgstr "&apt-author.team;" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-key.8.xml:14 apt-key.8.xml:21 +msgid "apt-key" +msgstr "apt-key" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-key.8.xml:22 +msgid "APT key management utility" +msgstr "APT-Schl??sselverwaltungsdienstprogramm" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-key.8.xml:28 +msgid "" +"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" +"arg>" +msgstr "" +"<command>apt-key</command> <arg><replaceable>Befehl</replaceable>/</arg> " +"<arg rep=\"repeat\"><option><replaceable>Argumente</replaceable></option></" +"arg>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:36 +msgid "" +"<command>apt-key</command> is used to manage the list of keys used by apt to " +"authenticate packages. Packages which have been authenticated using these " +"keys will be considered trusted." +msgstr "" +"<command>apt-key</command> wird benutzt, um eine Liste von Schl??sseln zu " +"verwalten, die APT benutzt, um Pakete zu authentifizieren. Pakete, die durch " +"Benutzung dieser Schl??ssel authentifiziert wurden, werden als vertrauensw??" +"rdig betrachtet." + +#. type: Content of: <refentry><refsect1><title> +#: apt-key.8.xml:42 +msgid "Commands" +msgstr "Befehle" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:44 +msgid "add <replaceable>filename</replaceable>" +msgstr "add <replaceable>Dateiname</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:48 +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>." +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." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:56 +msgid "del <replaceable>keyid</replaceable>" +msgstr "del <replaceable>Schl??ssel-ID</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:60 +msgid "Remove a key from the list of trusted keys." +msgstr "" +"Einen Schl??ssel von der Liste der vertrauensw??rdigen Schl??ssel entfernen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:67 +msgid "export <replaceable>keyid</replaceable>" +msgstr "export <replaceable>Schl??ssel-ID</replaceable>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:71 +msgid "Output the key <replaceable>keyid</replaceable> to standard output." +msgstr "" +"Den Schl??ssel <replaceable>Schl??ssel-ID</replaceable> auf der " +"Standardausgabe ausgeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:78 +msgid "exportall" +msgstr "exportall" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:82 +msgid "Output all trusted keys to standard output." +msgstr "Alle vertrauensw??rdigen Schl??ssel auf der Standardausgabe ausgeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:89 +msgid "list" +msgstr "list" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:93 +msgid "List trusted keys." +msgstr "Vertrauensw??rdige Schl??ssel auflisten." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:100 +msgid "finger" +msgstr "finger" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:104 +msgid "List fingerprints of trusted keys." +msgstr "Fingerabdr??cke vertrauensw??rdiger Schl??ssel auflisten." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:111 +msgid "adv" +msgstr "adv" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:115 +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 ??" +"ffentlichen Schl??ssel herunterladen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:127 +msgid "" +"Update the local keyring with the keyring of Debian archive keys and removes " +"from the keyring the archive keys which are no longer valid." +msgstr "" +"Den lokalen Schl??sselring mit dem Schl??sselring der Debian-Archivschl??" +"ssel aktualisieren und aus dem Schl??sselring die Archivschl??ssel " +"entfernen, die nicht l??nger g??ltig sind." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:140 +msgid "<filename>/etc/apt/trusted.gpg</filename>" +msgstr "<filename>/etc/apt/trusted.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:141 +msgid "Keyring of local trusted keys, new keys will be added here." +msgstr "" +"Schl??sselring der lokalen vertrauensw??rdigen Schl??ssel, neue Schl??ssel " +"werden hier hinzugef??gt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:144 +msgid "<filename>/etc/apt/trustdb.gpg</filename>" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:145 +msgid "Local trust database of archive keys." +msgstr "Lokale Datenbank vertrauensw??rdiger Archivschl??ssel." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:148 +msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:149 +msgid "Keyring of Debian archive trusted keys." +msgstr "Schl??sselring vertrauensw??rdiger Schl??ssel des Debian-Archivs." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-key.8.xml:152 +msgid "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-key.8.xml:153 +msgid "Keyring of Debian archive removed trusted keys." +msgstr "" +"Schl??sselring entfernter vertrauensw??rdiger Schl??ssel des Debian-Archivs." + +#. type: Content of: <refentry><refsect1><para> +#: apt-key.8.xml:164 +msgid "&apt-get;, &apt-secure;" +msgstr "&apt-get;, &apt-secure;" + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-mark.8.xml:13 +msgid "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"August 2009</date>" +msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9. " +"August 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-mark.8.xml:22 apt-mark.8.xml:29 +msgid "apt-mark" +msgstr "apt-mark" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-mark.8.xml:30 +msgid "mark/unmark a package as being automatically-installed" +msgstr "" +"ein Paket als automatisch installiert markieren oder diese Markierung " +"entfernen" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-mark.8.xml:36 +msgid "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain" +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" +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" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:53 +msgid "" +"<command>apt-mark</command> will change whether a package has been marked as " +"being automatically installed." +msgstr "" +"<command>apt-mark</command> wird ??ndern, ob ein Paket als automatisch " +"installiert markiert ist." + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:57 +msgid "" +"When you request that a package is installed, and as a result other packages " +"are installed to satisfy its dependencies, the dependencies are marked as " +"being automatically installed. Once these automatically installed packages " +"are no longer depended on by any manually installed packages, they will be " +"removed by e.g. <command>apt-get</command> or <command>aptitude</command>." +msgstr "" +"Wenn Sie die Installation eines Paketes anfordern und andere Pakete " +"installiert werden, um dessen Abh??ngigkeiten zu erf??llen, werden die Abh??" +"ngigkeiten als automatisch installiert markiert. Sobald keine manuell " +"installierten Pakete mehr von diesen automatisch installierten Paketen abh??" +"ngen, werden sie z.B durch <command>apt-get</command> oder " +"<command>aptitude</command> entfernt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:65 +msgid "markauto" +msgstr "markauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:66 +msgid "" +"<literal>markauto</literal> is used to mark a package as being automatically " +"installed, which will cause the package to be removed when no more manually " +"installed packages depend on this package." +msgstr "" +"<literal>markauto</literal> wird benutzt, um ein Paket als automatisch " +"installiert zu markieren, was veranlasst, dass das Paket entfernt wird, wenn " +"keine manuell installierten Pakete von ihm abh??ngen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:73 +msgid "unmarkauto" +msgstr "unmarkauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:74 +msgid "" +"<literal>unmarkauto</literal> is used to mark a package as being manually " +"installed, which will prevent the package from being automatically removed " +"if no other packages depend on it." +msgstr "" +"<literal>markauto</literal> wird benutzt, um ein Paket als manuell " +"installiert zu markieren, was verhindert, dass das Paket automatisch " +"entfernt wird, wenn kein anderes Paket von ihm abh??ngt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:81 +msgid "showauto" +msgstr "showauto" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:82 +msgid "" +"<literal>showauto</literal> is used to print a list of manually installed " +"packages with each package on a new line." +msgstr "" +"<literal>showauto</literal> wird benutzt, um eine Liste manuell " +"installierter Pakete mit einem Paket in jeder neuen Zeile, auszugeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:93 +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "" +"<option>-f=<filename><replaceable>DATEINAME</replaceable></filename></option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:94 +msgid "" +"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" +"option>" +msgstr "" +"<option>--file=<filename><replaceable>DATEINAME</replaceable></filename></" +"option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:97 +msgid "" +"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></" +"filename> instead of the default location, which is " +"<filename>extended_status</filename> in the directory defined by the " +"Configuration Item: <literal>Dir::State</literal>." +msgstr "" +"Paketstatus von <filename><replaceable>DATEINAME</replaceable></filename> " +"lesen/schreiben, anstatt vom Standardort, der <filename>extended_status</" +"filename> im von Konfigurationselement <literal>Dir::State</literal> " +"definierten Verzeichnis, ist." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:103 +msgid "<option>-h</option>" +msgstr "<option>-h</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:104 +msgid "<option>--help</option>" +msgstr "<option>--help</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:105 +msgid "Show a short usage summary." +msgstr "Eine kurze Zusammenfassung anzeigen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:111 +msgid "<option>-v</option>" +msgstr "<option>-v</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:112 +msgid "<option>--version</option>" +msgstr "<option>--version</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:113 +msgid "Show the program version." +msgstr "Die Programmversion anzeigen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-mark.8.xml:124 +msgid "<filename>/var/lib/apt/extended_states</filename>" +msgstr "<filename>/var/lib/apt/extended_states</filename>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-mark.8.xml:125 +msgid "" +"Status list of auto-installed packages. Configuration Item: <literal>Dir::" +"State</literal> sets the path to the <filename>extended_states</filename> " +"file." +msgstr "" +"Statusliste automatisch installierter Pakete. Konfigurationselement: " +"<literal>Dir::State</literal> setzt den Pfad zur Datei " +"<filename>extended_states</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:134 +msgid "&apt-get;,&aptitude;,&apt-conf;" +msgstr "&apt-get;,&aptitude;,&apt-conf;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-mark.8.xml:138 +msgid "" +"<command>apt-mark</command> returns zero on normal operation, non-zero on " +"error." +msgstr "" +"<command>apt-mark</command> gibt bei normalen Operationen Null zur??ck, bei " +"Fehlern nicht Null." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-secure.8.xml:14 apt-secure.8.xml:36 +msgid "apt-secure" +msgstr "apt-secure" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-secure.8.xml:37 +msgid "Archive authentication support for APT" +msgstr "Archivauthentifizierungsunterst??tzung f??r APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:42 +msgid "" +"Starting with version 0.6, <command>apt</command> contains code that does " +"signature checking of the Release file for all archives. This ensures that " +"packages in the archive can't be modified by people who have no access to " +"the Release file signing key." +msgstr "" +"Beginnend mit Version 0.6 enth??lt <command>apt</command> Code, der die " +"Signatur der Release-Datei f??r alle Archive pr??ft. Dies stellt sicher, " +"dass Pakete im Archiv nicht von Leuten ge??ndert werden k??nnen, die keinen " +"Zugriff auf den Signierschl??ssel der Release-Datei haben." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:50 +msgid "" +"If a package comes from a archive without a signature or with a signature " +"that apt does not have a key for that package is considered untrusted and " +"installing it will result in a big warning. <command>apt-get</command> will " +"currently only warn for unsigned archives, future releases might force all " +"sources to be verified before downloading packages from them." +msgstr "" +"Wenn ein Paket aus einem Archiv ohne Signatur stammt oder einem mit " +"Signatur, f??r das APT keinen Schl??ssel hat, wird dieses Paket als nicht " +"vertrauensw??rdig angesehen und es zu installieren, f??hrt zu einer gro??en " +"Warnung. <command>apt-get</command> wird aktuell nur bei nicht signierten " +"Archiven warnen, zuk??nftige Releases k??nnten die Pr??fung aller Quellen " +"vor dem Herunterladen von Paketen von dort erzwingen." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:59 +msgid "" +"The package frontends &apt-get;, &aptitude; and &synaptic; support this new " +"authentication feature." +msgstr "" +"Die Paketoberfl??chen &apt-get;, &aptitude; und &synaptic; unterst??tzen " +"diese neue Authentifizierungsfunktion." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:64 +msgid "Trusted archives" +msgstr "Vertrauensw??rdige Archive" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:67 +msgid "" +"The chain of trust from an apt archive to the end user is made up of " +"different steps. <command>apt-secure</command> is the last step in this " +"chain, trusting an archive does not mean that the packages that you trust it " +"do not contain malicious code but means that you trust the archive " +"maintainer. Its the archive maintainer responsibility to ensure that the " +"archive integrity is correct." +msgstr "" +"Eine Kette des Vertrauens von einem APT-Archiv zum Endanwender wird durch " +"verschiedene Schritte erreicht. <command>apt-secure</command> ist der letzte " +"Schritt in dieser Kette. Einem Archiv zu vertrauen bedeutet nicht, dass das " +"Paket, dem Sie vertrauen, keinen schadhaften Code enth??lt, aber es " +"bedeutet, dass Sie dem Archivbetreuer vertrauen. Der Archivbetreuer ist daf??" +"r verantwortlich, dass er die Korrektheit der Integrit??t des Archivs " +"sicherstellt." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:75 +msgid "" +"apt-secure does not review signatures at a package level. If you require " +"tools to do this you should look at <command>debsig-verify</command> and " +"<command>debsign</command> (provided in the debsig-verify and devscripts " +"packages respectively)." +msgstr "" +"apt-secure ??berpr??ft keine Signaturen auf einer Ebene des Pakets. Falls " +"Sie ein Werkzeug ben??tigen, das dies tut, sollten Sie einen Blick auf " +"<command>debsig-verify</command> und <command>debsign</command> werfen " +"(bereitgestellt von den Paketen debsig-verify beziehungsweise devscripts)." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:82 +msgid "" +"The chain of trust in Debian starts when a maintainer uploads a new package " +"or a new version of a package to the Debian archive. This upload in order to " +"become effective needs to be signed by a key of a maintainer within the " +"Debian maintainer's keyring (available in the debian-keyring package). " +"Maintainer's keys are signed by other maintainers following pre-established " +"procedures to ensure the identity of the key holder." +msgstr "" +"Die Kette des Vertrauens in Debian beginnt, wenn eine Betreuer ein neues " +"Paket oder eine neue Version eines Pakets in das Debian-Archiv hochl??dt. " +"Dieser Upload muss mit einem Schl??ssel des Betreuers, der sich im Schl??" +"sselring der Debian-Betreuer befindet (verf??gbar im Paket debian-keyring) " +"signiert werden. Betreuerschl??ssel werden von anderen Betreuern gem???? " +"vorbestimmter Regeln signiert, um die Identit??t des Schl??sselinhabers " +"sicherzustellen." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:92 +msgid "" +"Once the uploaded package is verified and included in the archive, the " +"maintainer signature is stripped off, an MD5 sum of the package is computed " +"and put in the Packages file. The MD5 sum of all of the packages files are " +"then computed and put into the Release file. The Release file is then signed " +"by the archive key (which is created once a year and distributed through the " +"FTP server. This key is also on the Debian keyring." +msgstr "" +"Sobald das hochgeladenen Paket ??berpr??ft und in das Archiv hinzugef??gt " +"wurde, wird die Betreuersignatur entfernt, eine MD5-Summe des Pakets " +"berechnet und in die Paketdatei getan. Dann werden die MD5-Summen aller " +"Paketdateien berechnet und in die Release-Datei getan. Dann wird die Release-" +"Datei durch den Archivschl??ssel signiert (der einmal j??hrlich erzeugt und " +"per FTP-Server verteilt wird). Dieser Schl??ssel ist au??erdem der Debian-" +"Schl??sselring." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:102 +msgid "" +"Any end user can check the signature of the Release file, extract the MD5 " +"sum of a package from it and compare it with the MD5 sum of the package he " +"downloaded. Prior to version 0.6 only the MD5 sum of the downloaded Debian " +"package was checked. Now both the MD5 sum and the signature of the Release " +"file are checked." +msgstr "" +"Jeder Endanwender kann die Signatur der Release-Datei pr??fen, die MD5-Summe " +"eines Paketes daraus entpacken und mit der MD5-Summe des Pakets vergleichen, " +"das er heruntergeladen hat. Vor Version 0.6 wurde nur die MD5-Summe des " +"heruntergeladenen Debian-Pakets gepr??ft. Nun werden sowohl die MD5-Summe " +"als auch die Signatur der Release-Datei gepr??ft." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:109 +msgid "" +"Notice that this is distinct from checking signatures on a per package " +"basis. It is designed to prevent two possible attacks:" +msgstr "" +"Beachten Sie, dass dies verschieden von gepr??ften Signaturen auf Paketbasis " +"ist. Es wurde entworfen, um zwei m??gliche Angriffe zu verhindern:" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:114 +msgid "" +"<literal>Network \"man in the middle\" attacks</literal>. Without signature " +"checking, a malicious agent can introduce himself in the package download " +"process and provide malicious software either by controlling a network " +"element (router, switch, etc.) or by redirecting traffic to a rogue server " +"(through arp or DNS spoofing attacks)." +msgstr "" +"<literal>Network \"man in the middle\" attacks</literal>. Ohne Signaturpr??" +"fung kann ein sch??dlicher Mittelsmann sich selbst in das Herunterladen von " +"Paketen einbringen und Schadsoftware bereitstellen. Dies kann entweder durch " +"Kontrolle eines Netzwerkelements (Router, Switch, etc.) oder durch Umleiten " +"des Netzverkehrs zu einem b??sartigen Server (durch ARP- oder DNS-" +"Manipulationsangriffe) erfolgen." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:122 +msgid "" +"<literal>Mirror network compromise</literal>. Without signature checking, a " +"malicious agent can compromise a mirror host and modify the files in it to " +"propagate malicious software to all users downloading packages from that " +"host." +msgstr "" +"<literal>Mirror network compromise</literal>. Ohne Signaturpr??fung kann " +"ein sch??dlicher Mittelsmann einen Spiegelserver kompromittieren und die " +"Dateien darauf ver??ndern, um sch??dliche Software an alle Anwender zu " +"verbreiten, die Pakete von diesem Rechner herunterladen." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:129 +msgid "" +"However, it does not defend against a compromise of the Debian master server " +"itself (which signs the packages) or against a compromise of the key used to " +"sign the Release files. In any case, this mechanism can complement a per-" +"package signature." +msgstr "" +"Es sch??tzt jedoch nicht gegen eine Kompromittierung des Haupt-Debian-" +"Servers selbst (der die Pakete signiert) oder gegen eine Kompromittierung " +"des Schl??ssels, der zum Signieren der Release-Dateien benutzt wird. In " +"jedem Fall kann dieser Mechanismus eine Signatur pro Paket erg??nzen." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:135 +msgid "User configuration" +msgstr "Benutzerkonfiguration" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:137 +msgid "" +"<command>apt-key</command> is the program that manages the list of keys used " +"by apt. It can be used to add or remove keys although an installation of " +"this release will automatically provide the default Debian archive signing " +"keys used in the Debian package repositories." +msgstr "" +"<command>apt-key</command> ist das Programm, das die Liste der von APT " +"verwendeten Schl??ssel verwaltet. Es kann benutzt werden, um Schl??ssel " +"hinzuzuf??gen oder zu entfernen, obwohl eine Installation dieses Releases " +"automatisch die Standard-Debian-Archivsignierschl??ssel bereitstellt, die in " +"den Debian-Paketdepots benutzt werden." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:144 +msgid "" +"In order to add a new key you need to first download it (you should make " +"sure you are using a trusted communication channel when retrieving it), add " +"it with <command>apt-key</command> and then run <command>apt-get update</" +"command> so that apt can download and verify the <filename>Release.gpg</" +"filename> files from the archives you have configured." +msgstr "" +"Um einen neuen Schl??ssel hinzuzuf??gen, m??ssen Sie ihn zuerst " +"herunterladen (Sie sollten sicherstellen, dass Sie einen vertrauensw??rdigen " +"Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit " +"<command>apt-key</command> hinzuf??gen und dann <command>apt-get update</" +"command> ausf??hren, so dass APT die <filename>Release.gpg</filename>-" +"Dateien der von Ihnen konfigurierten Archive herunterladen und pr??fen kann." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:153 +msgid "Archive configuration" +msgstr "Archivkonfiguration" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:155 +msgid "" +"If you want to provide archive signatures in an archive under your " +"maintenance you have to:" +msgstr "" +"Wenn Sie Archivsignaturen in einem von Ihnen betreuten Archiv zur Verf??gung " +"stellen m??chten, m??ssen Sie:" + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:160 +msgid "" +"<literal>Create a toplevel Release file</literal>. if it does not exist " +"already. You can do this by running <command>apt-ftparchive release</" +"command> (provided in apt-utils)." +msgstr "" +"<literal>Create a toplevel Release file</literal>, wenn es nicht bereits " +"existiert. Sie k??nnen dies tun, indem Sie <command>apt-ftparchive release</" +"command> (aus apt-utils) ausf??hren." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:165 +msgid "" +"<literal>Sign it</literal>. You can do this by running <command>gpg -abs -o " +"Release.gpg Release</command>." +msgstr "" +"<literal>Sign it</literal>. Sie k??nnen dies tun, indem Sie <command>gpg -" +"abs -o Release.gpg Release</command> ausf??hren." + +#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> +#: apt-secure.8.xml:168 +msgid "" +"<literal>Publish the key fingerprint</literal>, that way your users will " +"know what key they need to import in order to authenticate the files in the " +"archive." +msgstr "" +"<literal>Publish the key fingerprint</literal>, derart, dass Ihre Anwender " +"wissen, welchen Schl??ssel sie importieren m??ssen, um die Dateien im Archiv " +"zu authentifizieren." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:175 +msgid "" +"Whenever the contents of the archive changes (new packages are added or " +"removed) the archive maintainer has to follow the first two steps previously " +"outlined." +msgstr "" +"Immer wenn sich die Inhalte des Archivs ??ndern (neue Pakete hinzugef??gt " +"oder entfernt werden), muss der Archivbetreuen den beiden zuerst skizzierten " +"Schritten folgen." + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:183 +msgid "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" +msgstr "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:187 +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." +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 " +"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\" " +">Strong Distribution HOWTO</ulink> von V. Alex Brennen lesen." + +#. type: Content of: <refentry><refsect1><title> +#: apt-secure.8.xml:200 +msgid "Manpage Authors" +msgstr "Autoren der Handbuchseite" + +#. type: Content of: <refentry><refsect1><para> +#: apt-secure.8.xml:202 +#, fuzzy +#| msgid "" +#| "This man-page is based on the work of Javier Fern??ndez-Sanguino Pe??a, " +#| "Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgid "" +"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " +"Jones, Colin Walters, Florian Weimer and Michael Vogt." +msgstr "" +"Diese Handbuchseite basiert auf der Arbeit von Javier Fern??ndez-Sanguino " +"Pe??a, Isaac Jones, Colin Walters, Florian Weimer und Michael Vogt." + +#. type: Content of: <refentry><refnamediv><refname> +#: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29 +msgid "apt-sortpkgs" +msgstr "apt-sortpkgs" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt-sortpkgs.1.xml:30 +msgid "Utility to sort package index files" +msgstr "Werkzeug zum Sortieren von Paketindexdateien" + +#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> +#: apt-sortpkgs.1.xml:36 +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>" + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:45 +msgid "" +"<command>apt-sortpkgs</command> will take an index file (Source index or " +"Package index) and sort the records so that they are ordered by the package " +"name. It will also sort the internal fields of each record according to the " +"internal sorting rules." +msgstr "" +"<command>apt-sortpkgs</command> nimmt eine Indexdatei (Quell- oder " +"Paketindex) und sortiert die Datens??tze nach Paketnamen. Es wird au??erdem " +"die internen Felder jedes Datensatzes gem???? interner Sortierregeln " +"sortieren." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:51 +msgid "All output is sent to stdout, the input must be a seekable file." +msgstr "" +"Alle Ausgaben werden an stdout gesendet, die Eingabe muss eine durchsuchbare " +"Datei sein." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-sortpkgs.1.xml:58 +msgid "<option>--source</option>" +msgstr "<option>--source</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-sortpkgs.1.xml:60 +msgid "" +"Use Source index field ordering. Configuration Item: <literal>APT::" +"SortPkgs::Source</literal>." +msgstr "" +"Quellindexfeldanordnung benutzen. Konfigurationselement: <literal>APT::" +"SortPkgs::Source</literal>." + +#. type: Content of: <refentry><refsect1><para> +#: apt-sortpkgs.1.xml:74 +msgid "" +"<command>apt-sortpkgs</command> returns zero on normal operation, decimal " +"100 on error." +msgstr "" +"<command>apt-sortpkgs</command> gibt bei normalen Operationen 0 zur??ck, " +"dezimal 100 bei Fehlern." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt.conf.5.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>18 September 2009</date>" +msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Erste Dokumentation von " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>18. September 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt.conf.5.xml:28 apt.conf.5.xml:35 +msgid "apt.conf" +msgstr "apt.conf" + +#. type: Content of: <refentry><refmeta><manvolnum> +#: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 +msgid "5" +msgstr "5" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt.conf.5.xml:36 +msgid "Configuration file for APT" +msgstr "Konfigurationsdatei f??r APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:40 +msgid "" +"<filename>apt.conf</filename> is the main configuration file for the APT " +"suite of tools, all tools make use of the configuration file and a common " +"command line parser to provide a uniform environment. When an APT tool " +"starts up it will read the configuration specified by the <envar>APT_CONFIG</" +"envar> environment variable (if any) and then read the files in " +"<literal>Dir::Etc::Parts</literal> then read the main configuration file " +"specified by <literal>Dir::Etc::main</literal> then finally apply the " +"command line options to override the configuration directives, possibly " +"loading even more config files." +msgstr "" +"<filename>apt.conf</filename> ist die Hauptkonfigurationsdatei f??r die APT-" +"Werkzeugsammlung. Alle Werkzeuge benutzen die Konfigurationsdatei und einen " +"gemeinsamen Befehlszeilenauswerter, um eine einheitliche Umgebung " +"bereitzustellen. Wenn ein APT-Werkzeug startet, liest es die in der " +"Umgebungsvariablen <envar>APT_CONFIG</envar> (falls vorhanden) angegebene " +"Konfiguration, dann die Dateien in <literal>Dir::Etc::Parts</literal>, dann " +"die durch <literal>Dir::Etc::main</literal> angegebene Konfigurationsdatei " +"und ??bernimmt am Ende die Befehlszeilenoptionen, um " +"Konfigurationsdirektiven zu ??berschreiben und m??glicherweise sogar weitere " +"Konfigurationsdateien zu laden." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:50 +msgid "" +"The configuration file is organized in a tree with options organized into " +"functional groups. option specification is given with a double colon " +"notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option " +"within the APT tool group, for the Get tool. options do not inherit from " +"their parent groups." +msgstr "" +"Die Konfigurationsdatei ist in einem Baum mit Optionen organisiert, die in " +"funktionellen Gruppen organisiert sind. Optionsspezifikation wird mit einer " +"doppelten Doppelpunktschreibweise angegeben, zum Beispiel ist <literal>APT::" +"Get::Assume-Yes</literal> eine Option innerhalb der APT-Werkzeuggruppe f??r " +"das Werkzeug Get. Optionen werden nicht von ihren Elterngruppe geerbt." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:56 +msgid "" +"Syntactically the configuration language is modeled after what the ISC tools " +"such as bind and dhcp use. Lines starting with <literal>//</literal> are " +"treated as comments (ignored), as well as all text between <literal>/*</" +"literal> and <literal>*/</literal>, just like C/C++ comments. Each line is " +"of the form <literal>APT::Get::Assume-Yes \"true\";</literal> The trailing " +"semicolon is required and the quotes are optional. A new scope can be opened " +"with curly braces, like:" +msgstr "" +"Syntaktisch ist die Konfigurationssprache dem nachempfunden, was die ISC-" +"Werkzeuge, wie bind und dhcp, benutzen. Zeilen, die mit <literal>//</" +"literal> beginnen, werden als Kommentar betrachtet (und ignoriert), ebenso " +"wie jeglicher Text zwischen <literal>/*</literal> und <literal>*/</literal>, " +"wie bei C/C++-Kommentaren. Jede Zeile hat die Form <literal>APT::Get::Assume-" +"Yes \"true\";</literal>. Das abschlie??ende Semikolon wird ben??tigt und " +"Klammern sind optional. Ein neuer Geltungsbereich kann mit geschweiften " +"Klammern ge??ffnet werden, wie:" + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:66 +#, no-wrap +msgid "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" +msgstr "" +"APT {\n" +" Get {\n" +" Assume-Yes \"true\";\n" +" Fix-Broken \"true\";\n" +" };\n" +"};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:74 +msgid "" +"with newlines placed to make it more readable. Lists can be created by " +"opening a scope and including a single string enclosed in quotes followed by " +"a semicolon. Multiple entries can be included, each separated by a semicolon." +msgstr "" +"mit eingef??gten Zeilenumbr??chen, um es leserlicher zu gestalten. Listen k??" +"nnen erstellt werden, indem ein Geltungsbereich ge??ffnet wird und eine " +"einzelne, von Anf??hrungszeichen, denen ein Semikolon folgt, eingeschlossene " +"Zeichenkette eingef??gt wird. Es k??nnen mehrere Eintr??ge eingef??gt " +"werden, jeweils getrennt durch ein Semikolon." + +#. type: Content of: <refentry><refsect1><informalexample><programlisting> +#: apt.conf.5.xml:79 +#, no-wrap +msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:82 +msgid "" +"In general the sample configuration file in <filename>&docdir;examples/apt." +"conf</filename> &configureindex; is a good guide for how it should look." +msgstr "" +"Im Allgemeinen bietet die Beispielkonfigurationsdatei in <filename>&docdir;" +"examples/apt.conf</filename> &configureindex; eine gute Anleitung, wie dies " +"aussehen k??nnte." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:86 +msgid "" +"The names of the configuration items are not case-sensitive. So in the " +"previous example you could use <literal>dpkg::pre-install-pkgs</literal>." +msgstr "" +"Die Namen der Konfigurationselemente sind nicht von Gro??- und " +"Kleinschreibung abh??ngig. Deshalb k??nnten Sie im vorherigen Beispiel auch " +"<literal>dpkg::pre-install-pkgs</literal> benutzen." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:89 +msgid "" +"Names for the configuration items are optional if a list is defined as it " +"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example above. " +"If you don't specify a name a new entry will simply add a new option to the " +"list. If you specify a name you can override the option as every other " +"option by reassigning a new value to the option." +msgstr "" +"Namen f??r die Konfigurationsdatei sind optional, wenn eine Liste, wie sie " +"im Beispiel <literal>DPkg::Pre-Install-Pkgs</literal> oberhalb gesehen " +"werden kann, definiert ist. Wenn Sie keinen neuen Namen angeben, wird ein " +"neuer Eintrag der Liste lediglich eine neue Option hinzuf??gen. Wenn Sie " +"einen Namen eingeben, k??nnen Sie die Option, wie jede andere Option, ??" +"berschreiben, indem Sie der Option erneut einen neuen Wert zuweisen." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:94 +msgid "" +"Two specials are allowed, <literal>#include</literal> and <literal>#clear</" +"literal>: <literal>#include</literal> will include the given file, unless " +"the filename ends in a slash, then the whole directory is included. " +"<literal>#clear</literal> is used to erase a part of the configuration tree. " +"The specified element and all its descendants are erased. (Note that these " +"lines also need to end with a semicolon.)" +msgstr "" +"Es sind die beiden Spezialf??lle <literal>#include</literal> und " +"<literal>#clear</literal> erlaubt: <literal>#include</literal> wird die " +"angegebene Datei einf??gen au??er, wenn der Dateiname mit einem Schr??" +"gstrich endet, dann wird das ganze Verzeichnis eingef??gt. <literal>#clear</" +"literal> wird benutzt, um einen Teil des Konfigurationsbaums zu l??schen. " +"Das angegebene Element und alle davon absteigenden Elemente werden gel??" +"scht. (Beachten Sie, dass diese Zeilen auch mit einem Semikolon enden m??" +"ssen.)" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:101 +msgid "" +"The #clear command is the only way to delete a list or a complete scope. " +"Reopening a scope or the ::-style described below will <emphasis>not</" +"emphasis> override previously written entries. Only options can be " +"overridden by addressing a new value to it - lists and scopes can't be " +"overridden, only cleared." +msgstr "" +"Der #clear-Befehl ist der einzige Weg, eine Liste oder einen kompletten " +"Geltungsbereich zu l??schen. Erneutes ??ffnen eines Geltungsbereichs oder " +"der unten beschriebene ::-Stil werden vorherige Eintr??ge <emphasis>nicht</" +"emphasis> ??berschreiben. Optionen k??nnen nur ??berschrieben werden, indem " +"ein neuer Wert an sie adressiert wird ??? Listen und Geltungsbereiche k??" +"nnen nicht ??berschrieben, sondern nur bereinigt werden." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:106 +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.)" +msgstr "" +"Alle APT-Werkzeuge bringen eine Option -o mit, die es einer beliebigen " +"Installationsdirektiven erlaubt, auf der Befehlszeile angegeben zu werden. " +"Die Syntax ist ein vollst??ndiger Optionsname (<literal>APT::Get::Assume-" +"Yes</literal> zum Beispiel), gefolgt von einem Gleichheitszeichen und dann " +"dem neuen Wert der Option. Listen k??nnen ebenfalls durch Anh??ngen von " +"abschlie??enden :: zur Namensliste hinzugef??gt werden. (Wenn Ihnen das " +"merkw??rdig vorkommt: Die Geltungsbereichs-Syntax kann nicht auf der " +"Befehlszeile benutzt werden.)" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:113 +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." +msgstr "" +"Beachten Sie, dass Sie :: nur benutzen k??nnen, um ein Element pro Zeile an " +"eine Liste anzuh??ngen und dass Sie es nicht nicht in Verbindung mit einer " +"Geltungsbereichs-Syntax benutzen sollten. (Die Geltungsbereichssysyntax f??" +"gt implizit :: ein) Die Benutzung der Syntax von beiden zusammen wird einen " +"Fehler ausl??sen, den einige Anwender ung??nstigerweise weitergeben an eine " +"Option mit dem un??blichen Namen ??<literal>::</literal>??, der wie jede " +"andere Option mit einem Namen agiert. Dies leitet viele Probleme ein, " +"einschlie??lich, dass der Anwender, der mehrere Zeilen in dieser " +"<emphasis>falschen</emphasis> Syntax in der Hoffnung etwas an die Liste " +"anzuh??ngen schreibt, das Gegenteil von nur der letzten Zuweisung zu diese " +"Option ??<literal>::</literal>?? erreicht. Bevorstehende APT-Versionen " +"werden Fehler ausgeben und die Arbeit stoppen, wenn sie auf diese falsche " +"Verwendung sto??en. Korrigieren Sie deshalb nun solche Anweisungen, solange " +"sich APT nicht explizit dar??ber beklagt." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:125 +msgid "The APT Group" +msgstr "Die APT-Gruppe" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:126 +msgid "" +"This group of options controls general APT behavior as well as holding the " +"options for all of the tools." +msgstr "" +"Diese Gruppe von Optionen steuert das allgemeine Verhalten von APT, ebenso " +"wie es die Optionen f??r alle Werkzeuge enth??lt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:130 +msgid "Architecture" +msgstr "Architecture" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:131 +msgid "" +"System Architecture; sets the architecture to use when fetching files and " +"parsing package lists. The internal default is the architecture apt was " +"compiled for." +msgstr "" +"Systemarchitektur; Setzt die Architektur die benutzt wird, wenn Dateien " +"heruntergeladen und Paketlisten ausgewertet werden. Die interne Vorgabe ist " +"die Architektur f??r die APT kompiliert wurde." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:136 +msgid "Default-Release" +msgstr "Default-Release" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:137 +msgid "" +"Default release to install packages from if more than one version available. " +"Contains release name, codename or release version. Examples: 'stable', " +"'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-" +"preferences;." +msgstr "" +"Standard-Release von dem Pakete installiert werden, wenn mehr als eine " +"Version verf??gbar ist. Enth??lt Release-Name, Codename oder Release-" +"Version. Beispiele: ??stable??, ??testing, ??unstable??, ??lenny??, ??" +"squeeze??, ??4.0??, ??5.0??. Siehe auch &apt-preferences;." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:141 +msgid "Ignore-Hold" +msgstr "Ignore-Hold" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:142 +msgid "" +"Ignore Held packages; This global option causes the problem resolver to " +"ignore held packages in its decision making." +msgstr "" +"Halten von Paketen ignorieren; Diese globale Option veranlasst den Probleml??" +"ser, gehaltene Pakete beim Treffen von Entscheidungen zu ignorieren." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:146 +msgid "Clean-Installed" +msgstr "Clean-Installed" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:147 +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 " +"then packages that are locally installed are also excluded from cleaning - " +"but note that APT provides no direct means to reinstall them." +msgstr "" +"Standardm????ig auf on (ein). Wenn es auf on gesetzt wird, wird die " +"automatische Bereinigungsfunktion alle Pakete entfernen, die nicht l??nger " +"aus dem Zwischenspeicher heruntergeladen werden k??nnen. Wenn es auf off " +"gesetzt wird, dann werden au??erden die Pakete, die lokal installiert sind, " +"vom Bereinigen ausgeschlossen ??? beachten Sie jedoch, dass APT keine " +"direkten M??glichkeiten bereitstellt, um sie erneut zu installieren." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:153 +msgid "Immediate-Configure" +msgstr "Immediate-Configure" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:154 +msgid "" +"Disable Immediate Configuration; This dangerous option disables some of " +"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " +"necessary on some extremely slow single user systems but is very dangerous " +"and may cause package install scripts to fail or worse. Use at your own " +"risk." +msgstr "" +"Sofortkonfiguration ausschalten; Diese gef??hrliche Option schaltet einigen " +"Befehlscode von APT aus, um es zu veranlassen, Dpkg seltener aufzurufen. " +"Dies zu tun, k??nnte auf besonders langsamen Einzelbenutzersystemen n??tig " +"sein, ist aber gef??hrlich und k??nnte Paketinstallationsskripte zum " +"Scheitern oder schlimmeren veranlassen. Benutzen Sie es auf eigene Gefahr." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:161 +msgid "Force-LoopBreak" +msgstr "Force-LoopBreak" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:162 +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/" +"Conflicts or Conflicts/Pre-Depend loop between two essential packages. SUCH " +"A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option will work if the " +"essential packages are not tar, gzip, libc, dpkg, bash or anything that " +"those packages depend on." +msgstr "" +"Schalten Sie diese Option niemals ein, au??er wenn Sie -wirklich- wissen, " +"was Sie tun. Es erlaubt APT tempor??r ein essentielles Paket zu entfernen, " +"um eine Conflicts/Conflicts- oder Conflicts/Pre-Depend-Schleife zwischen " +"zwei essentiellen Paketen zu unterbrechen. SOLCH EINE SCHLEIFE SOLLTE " +"NIEMALS EXISTIEREN UND IST EIN SCHWERWIEGENDER FEHLER. Diese Option wird " +"funktionieren, wenn die essentiellen Pakete nicht tar, gzip, libc, dpkg, " +"bash oder etwas, was davon abh??ngt, sind." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:170 +msgid "Cache-Limit" +msgstr "Cache-Limit" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:171 +msgid "" +"APT uses a fixed size memory mapped cache file to store the 'available' " +"information. This sets the size of that cache (in bytes)." +msgstr "" +"APT benutzt eine Zwischenspeicherdatei mit fester Gr????e, um die ??verf??" +"gbar??-Informationen zu speichern. Dies setzt die Gr????e dieses " +"Zwischenspeichers (in Bytes)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:175 +msgid "Build-Essential" +msgstr "Build-Essential" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:176 +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:179 +msgid "Get" +msgstr "Get" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:180 +msgid "" +"The Get subsection controls the &apt-get; tool, please see its documentation " +"for more information about the options here." +msgstr "" +"Der Get-Unterabschnitt steuert das &apt-get;-Werkzeug. Lesen Sie bitte " +"dessen Dokumentation, um weitere Informationen ??ber die Optionen hier zu " +"erhalten." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:184 +msgid "Cache" +msgstr "Cache" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:185 +msgid "" +"The Cache subsection controls the &apt-cache; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"Der Cache-Unterabschnitt steuert das &apt-cache;-Werkzeug. Lesen Sie bitte " +"dessen Dokumentation, um weitere Informationen ??ber die Optionen hier zu " +"erhalten." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:189 +msgid "CDROM" +msgstr "CDROM" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:190 +msgid "" +"The CDROM subsection controls the &apt-cdrom; tool, please see its " +"documentation for more information about the options here." +msgstr "" +"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte " +"dessen Dokumentation, um weitere Informationen ??ber die Optionen hier zu " +"erhalten." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:196 +msgid "The Acquire Group" +msgstr "Die Erwerbgruppe" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:201 +msgid "PDiffs" +msgstr "PDiffs" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:202 +msgid "" +"Try to download deltas called <literal>PDiffs</literal> for Packages or " +"Sources files instead of downloading whole ones. True by default." +msgstr "" +"Versuchen, Deltas, die <literal>PDiffs</literal> genannt werden, f??r Paket- " +"oder Quelldateien herunterzuladen, statt der kompletten Dateien. Vorgabe ist " +"True." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:207 +msgid "Queue-Mode" +msgstr "Queue-Mode" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:208 +msgid "" +"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" +"literal> or <literal>access</literal> which determines how APT parallelizes " +"outgoing connections. <literal>host</literal> means that one connection per " +"target host will be opened, <literal>access</literal> means that one " +"connection per URI type will be opened." +msgstr "" +"Warteschlangenmodus; <literal>Queue-Mode</literal> kann entweder " +"<literal>host</literal> oder <literal>access</literal> sein, wodurch " +"festgelegt wird, wie APT ausgehende Verbindungen parallelisiert. " +"<literal>host</literal> bedeutet, dass eine Verbindung pro Zielrechner ge??" +"ffnet wird, <literal>access</literal> bedeutet, dass eine Verbindung pro URI-" +"Art ge??ffnet wird." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:215 +msgid "Retries" +msgstr "Retries" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:216 +msgid "" +"Number of retries to perform. If this is non-zero APT will retry failed " +"files the given number of times." +msgstr "" +"Anzahl der auszuf??hrenden erneuten Versuche. Wenn dies nicht Null ist, wird " +"APT fehlgeschlagene Dateien in der angegebenen Zahl erneut versuchen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:220 +msgid "Source-Symlinks" +msgstr "Source-Symlinks" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:221 +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 "" +"Symbolische Verweise f??r Quellarchive benutzen. Wenn dies auf true gesetzt " +"ist, werden Quellarchive, wenn m??glich, symbolisch verkn??pft, anstatt " +"kopiert zu werden. True ist die Vorgabe." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:225 sources.list.5.xml:139 +msgid "http" +msgstr "http" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:226 +msgid "" +"HTTP URIs; http::Proxy is the default http proxy to use. It is in the " +"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " +"host proxies can also be specified by using the form <literal>http::Proxy::" +"<host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. If no one of the above settings is specified, " +"<envar>http_proxy</envar> environment variable will be used." +msgstr "" +"HTTP-URIs; http::Proxy ist der zu benutzende Standard-HTTP-Proxy. Er wird " +"standardm????ig in der Form <literal>http://[[Anwender][:Passwort]@]Host[:" +"Port]/</literal> angegeben. Durch Host-Proxies kann au??erdem in der Form " +"<literal>http::Proxy::<host></literal> mit dem speziellen Schl??" +"sselwort <literal>DIRECT</literal> angegeben werden, dass keine Proxies " +"benutzt werden. Falls keine der obigen Einstellungen angegeben wurde, wird " +"die Umgebungsvariable <envar>http_proxy</envar> benutzt." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:234 +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 " +"response under any circumstances, <literal>Max-Age</literal> is sent only " +"for index files and tells the cache to refresh its object if it is older " +"than the given number of seconds. Debian updates its index files daily so " +"the default is 1 day. <literal>No-Store</literal> specifies that the cache " +"should never store this request, it is only set for archive files. This may " +"be useful to prevent polluting a proxy cache with very large .deb files. " +"Note: Squid 2.0.2 does not support any of these options." +msgstr "" +"F??r die Steuerung des Zwischenspeichers mit HTTP/1.1-konformen Proxy-" +"Zwischenspeichern stehen drei Einstellungen zur Verf??gung. <literal>No-" +"Cache</literal> teilt dem Proxy mit, dass er unter keinen Umst??nden seine " +"zwischengespeicherten Antworten benutzen soll, <literal>Max-Age</literal> " +"wird nur f??r Indexdateien gesendet und sagt dem Zwischenspeicher, dass er " +"seine Objekte erneuern soll, die ??lter als die angegebene Zahl in Sekunden " +"sind. Debian aktualisiert seine Indexdateien t??glich, so dass die Vorgabe " +"ein Tag ist. <literal>No-Store</literal> gibt an, dass der Zwischenspeicher " +"diese Anfragen niemals speichern soll, es ist nur f??r Archivdateien " +"gesetzt. Dies k??nnte n??tzlich sein, um Verunreinigungen des Proxy-" +"Zwischenspeichers mit sehr gro??en .deb-Dateien zu verhindern. Beachten Sie: " +"Squid 2.0.2 unterst??tzt keine dieser Optionen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:244 apt.conf.5.xml:301 +msgid "" +"The option <literal>timeout</literal> sets the timeout timer used by the " +"method, this applies to all things including connection timeout and data " +"timeout." +msgstr "" +"Die Option <literal>timeout</literal> stellt den Zeitnehmer f??r die Zeit??" +"berschreitung ein, die von der Methode benutzt wird. Dies wird auf alle " +"Dinge, einschlie??lich Verbindungs- und Datenzeit??berschreitungen, " +"angewandt." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:247 +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." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:255 +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 " +"which deactivates the limit and tries uses as much as possible of the " +"bandwidth (Note that this option implicit deactivates the download from " +"multiple servers at the same time.)" +msgstr "" +"Die benutzte Bandbreite kann durch <literal>Acquire::http::Dl-Limit</" +"literal> eingeschr??nkt werden, was Ganzzahlwerte in Kilobyte akzeptiert. " +"Der Vorgabewert ist 0, was die Beschr??nkung ausschaltet und versucht, " +"soviel wie m??glich von der Bandbreite zu benutzen. (Beachten Sie, dass " +"diese Optionen implizit das Herunterladen von mehreren Servern zur gleichen " +"Zeit deaktiviert.)" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:261 +msgid "https" +msgstr "https" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:262 +msgid "" +"HTTPS URIs. Cache-control and proxy options are the same as for " +"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"not supported yet." +msgstr "" +"HTTPS-URIs. Zwischenspeichersteuerung und Proxy-Optionen entsprehen denen " +"der <literal>http</literal>-Methode. Die Option <literal>Pipeline-Depth</" +"literal> wird noch nicht unterst??tzt." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:266 +msgid "" +"<literal>CaInfo</literal> suboption specifies place of file that holds info " +"about trusted certificates. <literal><host>::CaInfo</literal> is " +"corresponding per-host option. <literal>Verify-Peer</literal> boolean " +"suboption determines whether verify server's host certificate against " +"trusted certificates or not. <literal><host>::Verify-Peer</literal> " +"is corresponding per-host option. <literal>Verify-Host</literal> boolean " +"suboption determines whether verify server's hostname or not. <literal><" +"host>::Verify-Host</literal> is corresponding per-host option. " +"<literal>SslCert</literal> determines what certificate to use for client " +"authentication. <literal><host>::SslCert</literal> is corresponding " +"per-host option. <literal>SslKey</literal> determines what private key to " +"use for client authentication. <literal><host>::SslKey</literal> is " +"corresponding per-host option. <literal>SslForceVersion</literal> overrides " +"default SSL version to use. Can contain 'TLSv1' or 'SSLv3' string. " +"<literal><host>::SslForceVersion</literal> is corresponding per-host " +"option." +msgstr "" +"Die Unteroption <literal>CaInfo</literal> gibt den Ort an, an dem " +"Informationen ??ber vertrauensw??rdige Zertifikate bereitgehalten werden. " +"<literal><host>::CaInfo</literal> ist die entsprechende per-Host-" +"Option. Die boolsche Unteroption <literal>Verify-Peer</literal> entscheidet, " +"ob das Host-Zertifikat des Servers mit den vertrauensw??rdigen Zertifikaten " +"gepr??ft wird oder nicht. <literal><host>::Verify-Peer</literal> ist " +"die entsprechende per-Host-Option. Die boolsche Unteroption <literal>Verify-" +"Host</literal> entscheidet, ob der Host-Name des Servers gepr??ft wird oder " +"nicht. <literal><host>::Verify-Host</literal> ist die entsprechende " +"per-Host-Option. <literal>SslCert</literal> entscheidet, welches Zertifikat " +"zur Client-Authentifizierung benutzt wird. <literal><host>::SslCert</" +"literal> ist die entsprechende per-Host-Option. <literal>SslKey</literal> " +"entscheidet, welche privaten Schl??ssel f??r die Client-Authentifizierung " +"benutzt werden. <literal><host>::SslKey</literal> ist die " +"entsprechende per-Host-Option. <literal>SslForceVersion</literal> ??" +"berschreibt die zu benutzende Standard-SSL-Version. Es kann die " +"Zeichenketten ??TLSv1?? oder ??SSLv3?? enthalten. <literal><host>::" +"SslForceVersion</literal> ist die entsprechende per-Host-Option." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:284 sources.list.5.xml:150 +msgid "ftp" +msgstr "ftp" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:285 +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 " +"proxies can also be specified by using the form <literal>ftp::Proxy::<" +"host></literal> with the special keyword <literal>DIRECT</literal> " +"meaning to use no proxies. If no one of the above settings is specified, " +"<envar>ftp_proxy</envar> environment variable will be used. To use a ftp " +"proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in " +"the configuration file. This entry specifies the commands to send to tell " +"the proxy server what to connect to. Please see &configureindex; for an " +"example of how to do this. The substitution variables available are <literal>" +"$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>" +"$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> <literal>$(SITE)</" +"literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's " +"respective URI component." +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>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, " +"wird die Umgebungsvariable <envar>ftp_proxy</envar> benutzt. Um einen FTP-" +"Proxy zu benutzen, m??ssen Sie in der Konfigurationsdatei das Skript " +"<literal>ftp::ProxyLogin</literal> setzen. Dieser Eintrag gibt die Befehle " +"an, die gesendet werden m??ssen, um dem Proxy-Server mitzuteilen, womit er " +"sich verbinden soll. Um ein Beispiel zu erhalten, wie das gemacht wird, " +"lesen Sie bitte &configureindex;. Die Platzhaltervariablen sind <literal>" +"$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, <literal>" +"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" +"literal> und <literal>$(SITE_PORT)</literal>. Jede wird von ihrem " +"entsprechenden URI-Bestandteil genommen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:304 +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 " +"some situations require that passive mode be disabled and port mode ftp used " +"instead. This can be done globally, for connections that go through a proxy " +"or for a specific host (See the sample config file for examples)." +msgstr "" +"Mehrere Einstellungen werden zum Steuern des passiven Modus bereitgestellt. " +"Generell ist es sicher, den passiven Modus eingeschaltet zu lassen, er " +"funktioniert in nahezu jeder Umgebung. Jedoch erfordern einige Situationen, " +"dass der passive Modus ausgeschaltet und stattdessen Port-Modus-FTP benutzt " +"wird. Dies kann global f??r Verbindungen gemacht werden, die durch einen " +"Proxy oder ??ber einen bestimmten Host gehen (Lesen Sie die " +"Beispielskonfiguration, um Beispiele zu erhalten)." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:311 +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 " +"method above for syntax. You cannot set this in the configuration file and " +"it is not recommended to use FTP over HTTP due to its low efficiency." +msgstr "" +"Es ist m??glich FTP ??ber HTTP zu leiten, indem die Umgebungsvariable " +"<envar>ftp_proxy</envar> auf eine HTTP-Url gesetzt wird ??? lesen Sie die " +"Besprechung der HTTP-Methode oberhalb bez??glich der Syntax. Sie k??nnen " +"dies nicht in der Konfigurationsdatei setzen und es wird wegen der geringen " +"Effizienz nicht empfohlen FTP ??ber HTTP zu benutzen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:316 +msgid "" +"The setting <literal>ForceExtended</literal> controls the use of RFC2428 " +"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " +"false, which means these commands are only used if the control connection is " +"IPv6. Setting this to true forces their use even on IPv4 connections. Note " +"that most FTP servers do not support RFC2428." +msgstr "" +"Die Einstellung <literal>ForceExtended</literal> steuert die Benutzung der " +"RFC2428-Befehle <literal>EPSV</literal> und <literal>EPRT</literal>. Die " +"Vorgabe ist false, was bedeutet, dass diese Befehle nur benutzt werden, wenn " +"die Steuerverbindung IPv6 ist. Dies auf true zu stellen erzwingt die " +"Benutzung selbst auf IPv4-Verbindungen. Beachten Sie, dass die wenigsten FTP-" +"Server RFC2428 unterst??tzen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:323 sources.list.5.xml:132 +msgid "cdrom" +msgstr "cdrom" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:329 +#, no-wrap +msgid "\"/cdrom/\"::Mount \"foo\";" +msgstr "\"/cdrom/\"::Mount \"foo\";" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:324 +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 " +"drive as specified in <filename>/etc/fstab</filename>. It is possible to " +"provide alternate mount and unmount commands if your mount point cannot be " +"listed in the fstab (such as an SMB mount and old mount packages). The " +"syntax is to put <placeholder type=\"literallayout\" id=\"0\"/> within the " +"cdrom block. It is important to have the trailing slash. Unmount commands " +"can be specified using UMount." +msgstr "" +"CDROM-URIs; Die einzige Einstellung f??r CDROM-URIs ist der Einh??ngepunkt " +"<literal>cdrom::Mount</literal>, der der Einh??ngepunkt des CDROM-Laufwerks " +"sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist " +"m??glich alternative Ein- und Aush??ngebefehle anzugeben, falls Ihr Einh??" +"ngepunkt nicht in der fstab aufgelistet werden kann (so wie beim Einh??ngen " +"per SMB und alten Mount-Paketen). Die Syntax besteht darin, <placeholder " +"type=\"literallayout\" id=\"0\"/> in den CDROM-Block einzuf??gen. Der " +"abschlie??ende Schr??gstrich ist wichtig. Aush??ngebefehle k??nnen per " +"UMount angegeben werden." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:334 +msgid "gpgv" +msgstr "gpgv" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:335 +msgid "" +"GPGV URIs; the only option for GPGV URIs is the option to pass additional " +"parameters to gpgv. <literal>gpgv::Options</literal> Additional options " +"passed to gpgv." +msgstr "" +"GPGV-URIs; Die einzige Option f??r GPGV-URIs ist die Option zus??tzliche " +"Parameter an gpgv weiterzuleiten. <literal>gpgv::Options</literal> Zus??" +"tzliche Parameter werden an gpgv weitergeleitet." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:340 +msgid "CompressionTypes" +msgstr "CompressionTypes" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:346 +#, 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:341 +msgid "" +"List of compression types which are understood by the acquire methods. " +"Files like <filename>Packages</filename> can be available in various " +"compression formats. Per default the acquire methods can decompress " +"<command>bzip2</command>, <command>lzma</command> and <command>gzip</" +"command> compressed files, with this setting more formats can be added on " +"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 " +"werden. Dateien wie <filename>Packages</filename> k??nnen in verschiedenen " +"Kompressionsformaten verf??gbar sein. Standardm????ig k??nnen die ??aquire??-" +"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 " +"Methode ge??ndert werden. Die Syntax daf??r lautet: <placeholder type=" +"\"synopsis\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> +#: apt.conf.5.xml:351 +#, 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:354 +#, 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:347 +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 " +"acquire system will try the first and proceed with the next compression type " +"in this list on error, so to prefer one over the other type simple add the " +"preferred type at first - not already added default types will be added at " +"run time to the end of the list, so e.g. <placeholder type=\"synopsis\" id=" +"\"0\"/> can be used to prefer <command>gzip</command> compressed files over " +"<command>bzip2</command> and <command>lzma</command>. If <command>lzma</" +"command> should be preferred over <command>gzip</command> and " +"<command>bzip2</command> the configure setting should look like this " +"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add " +"<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 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 hinzugef??gte Standardtypen werden zur Laufzeit an das Ende der " +"Liste angeh??ngt, so kann z.B. <placeholder type=\"synopsis\"id=\"0\"/> " +"verwandt werden, um <command>gzip</command>-komprimierte Dateien ??ber " +"<command>bzip2</command> und <command>lzma</command> zu bevorzugen. Falls " +"<command>lzma</command> vor <command>gzip</command> und <command>bzip2</" +"command> vorgezogen werden soll, sollte die Konfigurationseinstellung so " +"aussehen: <placeholder type=\"synopsis\" id=\"1\"/>. Es ist nicht n??tig " +"<literal>bz2</literal> 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:358 +#, 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:356 +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 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." +msgstr "" +"Beachten Sie, dass <literal>Dir::Bin::<replaceable>Methodenname</" +"replaceable></literal> zur Laufzeit gepr??ft wird: Falls diese Einstellung " +"existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. f??r " +"die (integrierte) bzip2-Methode ist die Einstellung <placeholder type=" +"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile " +"eingegebenen Eintr??ge an das Ende der Liste angeh??ngt werden, die in den " +"Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeintr??gen. Um " +"einen Eintrag in diesem Fall vor einem, ??ber die in der Konfigurationsdatei " +"angegebenen, zu bevorzugen, k??nnen Sie diese Option direkt setzen ??? nicht " +"im Listenstil. Dies wird die definierte Liste nicht ??berschreiben, es wird " +"diesen Typ nur vor die Liste setzen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:363 +msgid "" +"While it is possible to add an empty compression type to the order list, but " +"APT in its current version doesn't understand it correctly and will display " +"many warnings about not downloaded files - these warnings are most of the " +"time false negatives. Future versions will maybe include a way to really " +"prefer uncompressed files to support the usage of local mirrors." +msgstr "" +"Obwohl es m??glich ist, einen leeren Komprimierungstyp zu der " +"Reihenfolgenliste hinzuzuf??gen, versteht dies APT in der aktuellen Version " +"nicht richtig und wird viele Warnungen wegen nicht heruntergeladener Dateien " +"anzeigen ??? diese Warnungen sind meistens inkorrekte Treffer. Zuk??nftige " +"Versionen werden m??glicherweise eine M??glichkeit enthalten, um wirklich " +"unkomprimierte Dateien vorzuziehen, um den Gebrauch lokaler Spiegel zu " +"unterst??tzen." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:197 +msgid "" +"The <literal>Acquire</literal> group of options controls the download of " +"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Die <literal>Acquire</literal>-Gruppe der Optionen steuert das Herunterladen " +"von Paketen und die URI-Steuerprogramme. <placeholder type=\"variablelist\" " +"id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:372 +msgid "Directories" +msgstr "Verzeichnisse" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:374 +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>." +msgstr "" +"Der <literal>Dir::State</literal>-Abschnitt hat Verzeichnisse, die zu " +"lokalen Statusinformationen geh??ren. <literal>lists</literal> ist das " +"Verzeichnis, in das heruntergeladene Paketlisten platziert werden und " +"<literal>status</literal> ist der Name der Dpkg-Statusdatei. " +"<literal>preferences</literal> ist der Name der APT-Einstellungsdatei. " +"<literal>Dir::State</literal> enth??lt das Standardverzeichnis, das allen " +"Unterelementen vorangestellt wird, falls sie nicht mit <filename>/</" +"filename> oder <filename>./</filename> beginnen." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:381 +msgid "" +"<literal>Dir::Cache</literal> contains locations pertaining to local cache " +"information, such as the two package caches <literal>srcpkgcache</literal> " +"and <literal>pkgcache</literal> as well as the location to place downloaded " +"archives, <literal>Dir::Cache::archives</literal>. Generation of caches can " +"be turned off by setting their names to be blank. This will slow down " +"startup but save disk space. It is probably preferred to turn off the " +"pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " +"default directory is contained in <literal>Dir::Cache</literal>" +msgstr "" +"<literal>Dir::Cache</literal> enth??lt Orte, die zu lokalen " +"Zwischenspeicherinformationen geh??ren, so wie die beiden " +"Paketzwischenspeicher <literal>srcpkgcache</literal> und <literal>pkgcache</" +"literal>, sowie der Ort, an den heruntergeladene Archive platziert werden, " +"<literal>Dir::Cache::archives</literal>. Die Generierung von " +"Zwischenspeichern kann ausgeschaltet werden, indem ihre Namen leer gelassen " +"werden. Dies wird den Start verlangsamen, aber Plattenplatz sparen. Es ist " +"vermutlich vorzuziehen, statt des ??pkgcache??s den ??srcpkgcache?? " +"auszuschalten. Wie <literal>Dir::State</literal> ist das Standardverzeichnis " +"in <literal>Dir::Cache</literal> enthalten." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:390 +msgid "" +"<literal>Dir::Etc</literal> contains the location of configuration files, " +"<literal>sourcelist</literal> gives the location of the sourcelist and " +"<literal>main</literal> is the default configuration file (setting has no " +"effect, unless it is done from the config file specified by " +"<envar>APT_CONFIG</envar>)." +msgstr "" +"<literal>Dir::Etc</literal> enth??lt den Ort der Konfigurationsdateien, " +"<literal>sourcelist</literal> gibt den Ort der Quellliste und <literal>main</" +"literal> ist die Standardkonfigurationsdatei (Einstellung hat keine " +"Auswirkung, au??er wenn sie aus der in <envar>APT_CONFIG</envar> angegebenen " +"Konfigurationsdatei erfolgt)." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:396 +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 " +"main config file is loaded." +msgstr "" +"Die <literal>Dir::Parts</literal>-Einstellung liest in allen " +"Konfigurationsteilen in lexikalischer Reihenfolge vom angegebenen " +"Verzeichnis. Nachdem dies geschehen ist, wird die Hauptkonfigurationsdatei " +"geladen." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:400 +msgid "" +"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" +"Bin::Methods</literal> specifies the location of the method handlers and " +"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, " +"<literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</" +"literal> <literal>dpkg-buildpackage</literal> and <literal>apt-cache</" +"literal> specify the location of the respective programs." +msgstr "" +"Auf bin??re Programme wird von <literal>Dir::Bin</literal> verwiesen. " +"<literal>Dir::Bin::Methods</literal> gibt den Ort des " +"Methodensteuerungsprogramms an und <literal>gzip</literal>, <literal>bzip2</" +"literal>, <literal>lzma</literal>, <literal>dpkg</literal>, <literal>apt-" +"get</literal>, <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</" +"literal> und <literal>apt-cache</literal> geben den Ort des jeweiligen " +"Programms an." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:408 +msgid "" +"The configuration item <literal>RootDir</literal> has a special meaning. If " +"set, all paths in <literal>Dir::</literal> will be relative to " +"<literal>RootDir</literal>, <emphasis>even paths that are specified " +"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is " +"set to <filename>/tmp/staging</filename> and <literal>Dir::State::status</" +"literal> is set to <filename>/var/lib/dpkg/status</filename>, then the " +"status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</" +"filename>." +msgstr "" +"Das Konfigurationselement <literal>RootDir</literal> hat eine besondere " +"Bedeutung. Falls es gesetzt ist, sind alle Pfad relativ zu <literal>RootDir</" +"literal>, <emphasis>sogar Pfade, die absolut angegeben wurden</emphasis>. So " +"wird zum Beispiel, wenn <literal>RootDir</literal> auf <filename>/tmp/" +"staging</filename> und <literal>Dir::State::status</literal> auf <filename>/" +"var/lib/dpkg/status</filename> gesetzt ist, nach der Statusdatei in " +"<filename>/tmp/staging/var/lib/dpkg/status</filename> nachgesehen." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:421 +msgid "APT in DSelect" +msgstr "APT in DSelect" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:423 +msgid "" +"When APT is used as a &dselect; method several configuration directives " +"control the default behaviour. These are in the <literal>DSelect</literal> " +"section." +msgstr "" +"Wenn APT als eine &dselect;-Methode benutzt wird, steuern mehrere " +"Konfigurationsdirektiven das Standardverhalten. Diese stehen im Abschnitt " +"<literal>DSelect</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:427 +msgid "Clean" +msgstr "Clean" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:428 +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 " +"upgrading, prompt (the default) does so conditionally. auto removes only " +"those packages which are no longer downloadable (replaced with a new version " +"for instance). pre-auto performs this action before downloading new " +"packages." +msgstr "" +"Zwischenspeicherbereinigungsmodus; Dieser Wert kann entweder always, prompt, " +"auto, pre-auto oder never sein. always und prompt werden, nachdem das " +"Upgrade durchgef??hrt wurde, alle Pakete aus dem Zwischenspeicher entfernen, " +"prompt (die Vorgabe) tut dies bedingt. auto entfernt nur jene Pakete, die " +"nicht l??nger heruntergeladen werden k??nnen (zum Beispiel, weil sie durch " +"eine neue Version ersetzt wurden). pre-auto f??hrt diese Aktion vor dem " +"Herunterladen neuer Pakete durch." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:437 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the install phase." +msgstr "" +"Die Inhalte dieser Variablen werden als Befehlszeilenoptionen an &apt-get; ??" +"bermittelt, wenn es f??r die Installationsphase durchlaufen wird." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:441 +msgid "Updateoptions" +msgstr "Updateoptions" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:442 +msgid "" +"The contents of this variable is passed to &apt-get; as command line options " +"when it is run for the update phase." +msgstr "" +"Die Inhalte dieser Variable werden als Befehlszeilenoptionen an &apt-get; ??" +"bermittelt, wenn es f??r die Aktualisierungsphase durchlaufen wird." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:446 +msgid "PromptAfterUpdate" +msgstr "PromptAfterUpdate" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:447 +msgid "" +"If true the [U]pdate operation in &dselect; will always prompt to continue. " +"The default is to prompt only on error." +msgstr "" +"Falls true, wird die Aktualisierungsoption [U] in &dselect; immer " +"nachfragen, um fortzufahren. Vorgabe ist es, nur bei Fehlern nachzufragen." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:453 +msgid "How APT calls dpkg" +msgstr "Wie APT Dpkg aufruft" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:454 +msgid "" +"Several configuration directives control how APT invokes &dpkg;. These are " +"in the <literal>DPkg</literal> section." +msgstr "" +"Mehrere Konfigurationsdirektiven steuern, wie APT &dpkg; aufruft. Diese " +"stehen im Abschnitt <literal>DPkg</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:459 +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 " +"&dpkg;." +msgstr "" +"Dies ist eine Liste von Optionen, die an Dpkg ??bermittelt werden. Die " +"Optionen m??ssen unter Benutzung der Listenschreibweise angegeben werden und " +"jedes Listenelement wird als einzelnes Argument an &dpkg; ??bermittelt." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:464 +msgid "Pre-Invoke" +msgstr "Pre-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:464 +msgid "Post-Invoke" +msgstr "Post-Invoke" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:465 +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort." +msgstr "" +"Dies ist eine Liste von Shell-Befehlen, die vor/nach dem Aufruf von &dpkg; " +"ausgef??hrt werden. Wie <literal>options</literal> muss dies in " +"Listenschreibweise angegeben werden. Die Befehle werden der Reihenfolge nach " +"mit <filename>/bin/sh</filename> aufgerufen, sollte einer fehlschlagen, wird " +"APT abgebrochen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:471 +msgid "Pre-Install-Pkgs" +msgstr "Pre-Install-Pkgs" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:472 +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 " +"commands are invoked in order using <filename>/bin/sh</filename>, should any " +"fail APT will abort. APT will pass to the commands on standard input the " +"filenames of all .deb files it is going to install, one per line." +msgstr "" +"Dies ist eine Liste von Shell-Befehlen, die vor dem Aufruf von Dpkg ausgef??" +"hrt werden. Wie <literal>options</literal> muss dies in Listenschreibweise " +"angegeben werden. Die Befehle werden der Reihenfolge nach mit <filename>/bin/" +"sh</filename> aufgerufen, sollte einer fehlschlagen, wird APT abgebrochen. " +"APT wird den Befehlen auf der Standardeingabe die Dateinamen aller .deb-" +"Dateien, die es installieren wird, ??bergeben, einen pro Zeile." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:478 +msgid "" +"Version 2 of this protocol dumps more information, including the protocol " +"version, the APT configuration space and the packages, files and versions " +"being changed. Version 2 is enabled by setting <literal>DPkg::Tools::" +"options::cmd::Version</literal> to 2. <literal>cmd</literal> is a command " +"given to <literal>Pre-Install-Pkgs</literal>." +msgstr "" +"Version 2 dieses Protokolls gibt mehr Informationen aus, einschlie??lich der " +"Protokollversion, dem APT-Konfigurationsraum und den Paketen, Dateien und " +"den Versionen, die ge??ndert werden. Version 2 wird durch Setzen von " +"<literal>DPkg::Tools::options::cmd::Version</literal> auf 2 eingeschaltet. " +"<literal>cmd</literal> ist ein Befehl, der an <literal>Pre-Install-Pkgs</" +"literal> gegeben wird." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:485 +msgid "Run-Directory" +msgstr "Run-Directory" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:486 +msgid "" +"APT chdirs to this directory before invoking dpkg, the default is <filename>/" +"</filename>." +msgstr "" +"APT wechselt mit chdir in dieses Verzeichnis, bevor Dpkg aufgerufen wird, " +"die Vorgabe ist <filename>/</filename>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:490 +msgid "Build-options" +msgstr "Build-options" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:491 +msgid "" +"These options are passed to &dpkg-buildpackage; when compiling packages, the " +"default is to disable signing and produce all binaries." +msgstr "" +"Diese Optionen werden an &dpkg-buildpackage; beim Kompilieren von Paketen ??" +"bermittelt. Standardm????ig wird das Signieren augeschaltet und alle " +"Programme werden erstellt." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt.conf.5.xml:496 +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:497 +msgid "" +"APT can call dpkg in a way so it can make aggressive use of triggers over " +"multiply calls of dpkg. Without further options dpkg will use triggers only " +"in between his own run. Activating these options can therefore decrease the " +"time needed to perform the install / upgrade. Note that it is intended to " +"activate these options per default in the future, but as it changes the way " +"APT calling dpkg drastically it needs a lot more testing. <emphasis>These " +"options are therefore currently experimental and should not be used in " +"productive environments.</emphasis> Also it breaks the progress reporting so " +"all frontends will currently stay around half (or more) of the time in the " +"100% state while it actually configures all packages." +msgstr "" +"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von " +"Triggern ??ber mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird " +"Dpkg Trigger nur w??hrend seiner eigenen Ausf??hrung benutzen. Diese " +"Optionen zu benutzen, kann daher die zum Installieren/Upgrade ben??tigte " +"Zeit verk??rzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft " +"standardm????ig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, " +"drastisch ??ndert, ben??tigt es noch viele weitere Tests. <emphasis>Diese " +"Optionen sind daher aktuell noch experimentell und sollten nicht in " +"produktiven Umgebungen benutzt werden.</emphasis> Au??erdem unterbricht es " +"die Fortschrittsanzeige, so dass alle Oberfl??chen aktuell in der halben " +"(oder mehr) Zeit auf dem Status 100% stehen, w??hrend es aktuell alle Pakete " +"konfiguriert." + +#. type: Content of: <refentry><refsect1><refsect2><para><literallayout> +#: apt.conf.5.xml:512 +#, no-wrap +msgid "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" +msgstr "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt.conf.5.xml:506 +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 " +"understand the current risks and problems with these options, but are brave " +"enough to help testing them create a new configuration file and test a " +"combination of options. Please report any bugs, problems and improvements " +"you encounter and make sure to note which options you have used in your " +"reports. Asking dpkg for help could also be useful for debugging proposes, " +"see e.g. <command>dpkg --audit</command>. A defensive option combination " +"would be <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Beachten Sie, dass es nicht gew??hrleistet ist, dass APT diese Optionen " +"unterst??tzen wird oder dass diese Optionen in der Zukunft keinen (gro??" +"en) ??rger machen. Wenn Sie die allgemeinen Risiken und Probleme mit diesen " +"Optionen verstanden haben, aber tapfer genug sind, sie testen zu helfen, " +"erstellen Sie eine neue Konfigurationsdatei und testen Sie eine Kombination " +"von Optionen. Bitte berichten Sie auf Englisch jegliche Fehler, Probleme und " +"Verbesserungen, denen Sie begegnen und stellen Sie sicher, dass Sie alle von " +"Ihnen benutzten Optionen in Ihren Berichten vermerken. Zum Zweck der " +"Fehlersuche k??nnte es au??erdem n??tzlich sein, Dpkg um Hilfe zu fragen. " +"Lesen Sie z.B. <command>dpkg --audit</command>. Eine defensive " +"Optionenkombination w??re <placeholder type=\"literallayout\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:518 +msgid "DPkg::NoTriggers" +msgstr "DPkg::NoTriggers" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:519 +msgid "" +"Add the no triggers flag to all dpkg calls (expect the ConfigurePending " +"call). See &dpkg; if you are interested in what this actually means. In " +"short: dpkg will not run the triggers then this flag is present unless it is " +"explicit called to do so in an extra call. Note that this option exists " +"(undocumented) also in older apt versions with a slightly different meaning: " +"Previously these option only append --no-triggers to the configure calls to " +"dpkg - now apt will add these flag also to the unpack and remove calls." +msgstr "" +"Die keine-Trigger-Markierung zu allen Dpkg-Aufrufen hinzuf??gen (ausgenommen " +"den ConfigurePending-Aufruf). Siehe &dpkg;, wenn Sie interessiert sind, was " +"dies tats??chlich bedeutet. In K??rze: Dpkg wird die Trigger nicht ausf??" +"hren, dann ist diese Markierung vorhanden, au??er sie wird explizit " +"aufgerufen, um dies in einem gesonderten Aufruf zu tun. Beachten Sie, dass " +"diese Option au??erdem in ??lteren APT-Versionen mit einer geringf??gig " +"anderen Bedeutung existiert (nicht dokumentiert): Vorher hing diese Option " +"nur --no-triggers an die Konfigurationsaufrufe f??r Dpkg an ??? nun wird APT " +"diese Markierung au??erdem an die unpack- und remove-Aufrufe anh??ngen." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:526 +msgid "PackageManager::Configure" +msgstr "PackageManager::Configure" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:527 +msgid "" +"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " +"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " +"value and causes APT to configure all packages explicit. The " +"\"<literal>smart</literal>\" way is it to configure only packages which need " +"to be configured before another package can be unpacked (Pre-Depends) and " +"let the rest configure by dpkg with a call generated by the next option. " +"\"<literal>no</literal>\" on the other hand will not configure anything and " +"totally relay on dpkg for configuration (which will at the moment fail if a " +"Pre-Depends is encountered). Setting this option to another than the all " +"value will implicit activate also the next option per default as otherwise " +"the system could end in an unconfigured status which could be unbootable!" +msgstr "" +"G??ltige Werte sind ??<literal>all</literal>??, ??<literal>smart</literal>?? " +"und ??<literal>no</literal>??. ??<literal>all</literal>?? ist der " +"Vorgabewert und veranlasst APT alle Pakete explizit zu konfigurieren. Die " +"Art von ??<literal>smart</literal>?? ist es, nur die Pakete zu " +"konfigurieren, die konfiguriert werden m??ssen, bevor eine anderes Paket " +"entpackt (Pre-Depends) werden kann und den Rest von Dpkg mit einem Aufruf, " +"der von der n??chsten Option generiert wurde, konfigurieren zu lassen. Im " +"Gegensatz dazu wird ??<literal>no</literal>?? nicht konfigurieren und v??" +"llig die Konfiguration von Dpkg weitergeben (die in dem Moment fehlschl??gt, " +"in dem ein Pre-Depends vorkommt). Diese Option auf etwas anderes als all zu " +"setzen, wird au??erdem implizit standardm????ig die n??chste Option " +"aktivieren, da das System anderenfalls in einem nicht konfigurierten Status " +"enden k??nnte, der nicht mehr startbar sein k??nnte." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:537 +msgid "DPkg::ConfigurePending" +msgstr "DPkg::ConfigurePending" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:538 +msgid "" +"If this option is set apt will call <command>dpkg --configure --pending</" +"command> to let dpkg handle all required configurations and triggers. This " +"option is activated automatic per default if the previous option is not set " +"to <literal>all</literal>, but deactivating could be useful if you want to " +"run APT multiple times in a row - e.g. in an installer. In this sceneries " +"you could deactivate this option in all but the last run." +msgstr "" +"Wenn diese Option gesetzt ist, wird APT <command>dpkg --configure --pending</" +"command> aufrufen, um Dpkg alle ben??tigten Konfigurationen und Trigger " +"handhaben zu lassen. Diese Option ist als Vorgabe automatisch aktiviert, " +"wenn die vorherige Option nicht auf <literal>all</literal> gesetzt ist, aber " +"Deaktivieren k??nnte n??tzlich sein, wenn Sie APT mehrmals hintereinander " +"ausf??hren m??chten ??? z.B. in einem Installationsprogramm. In diesen " +"Szenarien k??nnten Sie diese Option au??er in allen au??er der letzten Ausf??" +"hrung deaktivieren." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:544 +msgid "DPkg::TriggersPending" +msgstr "DPkg::TriggersPending" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:545 +msgid "" +"Useful for <literal>smart</literal> configuration as a package which has " +"pending triggers is not considered as <literal>installed</literal> and dpkg " +"treats them as <literal>unpacked</literal> 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." +msgstr "" +"N??tzlich f??r <literal>smart</literal>-Konfiguration, da ein Paket mit " +"ausstehenden Triggern nicht als <literal>installed</literal> angesehen wird " +"und Dpkg es als aktuell entpackt betrachtet, was ein Hemmschuh f??r Pre-" +"Dependencies ist (siehe Debian-Fehler #526774). Beachten Sie, dass dies alle " +"Trigger ausf??hrt, nicht nur die Trigger, die zum Konfigurieren dieses " +"Pakets ben??tigt werden." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:550 +msgid "PackageManager::UnpackAll" +msgstr "PackageManager::UnpackAll" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:551 +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-" +"Depends. Default is true and therefore the \"old\" method of ordering in " +"various steps by everything. While both method were present in earlier APT " +"versions the <literal>OrderCritical</literal> method was unused, so this " +"method is very experimental and needs further improvements before becoming " +"really useful." +msgstr "" +"Da die Konfiguration an das Ende von Dpkg verschoben werden kann, kann " +"versucht werden, nur die Entpackserien von kritischen Notwendigkeiten, z.B. " +"von Pre-Depends, anzuweisen. Vorgabe ist true und daher die ??alte?? Methode " +"zum Sortieren nach allem in mehreren Schritten. Obwohl in fr??heren " +"Versionen von APT beide Methoden enthalten waren, wurde die " +"<literal>OrderCritical</literal>-Methode nicht benutzt, so dass diese " +"Methode sehr experimentell ist und weitere Verbesserungen ben??tigt, bevor " +"sie wirklich n??tzlich wird." + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> +#: apt.conf.5.xml:558 +msgid "OrderList::Score::Immediate" +msgstr "OrderList::Score::Immediate" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> +#: apt.conf.5.xml:566 +#, no-wrap +msgid "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" +msgstr "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" + +#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:559 +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 " +"upgrade process as these these configure calls require currently also " +"<literal>DPkg::TriggersPending</literal> which will run quite a few triggers " +"(which maybe not needed). Essentials get per default a high score but the " +"immediate flag is relatively low (a package which has a Pre-Depends is " +"higher rated). These option and the others in the same group can be used to " +"change the scoring. The following example shows the settings with there " +"default values. <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Essentielle Pakete (und ihre Abh??ngigkeiten) sollten sofort nach dem " +"Entpacken konfiguriert werden. Es ist eine gute Idee, dies ziemlich fr??h im " +"Upgrade-Prozess zu tun, da diese Konfigurationsaufrufe aktuell au??erdem " +"<literal>DPkg::TriggersPending</literal> ben??tigen, das eine Reihe von " +"Triggern ausf??hrt (die m??glicherweise nicht gebraucht werden). Essentielle " +"Pakete haben als Vorgabe eine hohe Bewertung, aber die immediate-Markierung " +"ist relativ niedrig (ein Paket, das Pre-Depends hat, wird h??her bewertet). " +"Diese Option und die anderen in der gleichen Gruppe k??nnen benutzt werden, " +"um die Bewertung zu ??ndern. Das folgende Beispiel zeigt die Einstellungen " +"mit ihren Vorgabewerten. <placeholder type=\"literallayout\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:579 +msgid "Periodic and Archives options" +msgstr "Periodische- und Archivoptionen" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:580 +msgid "" +"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " +"of options configure behavior of apt periodic updates, which is done by " +"<literal>/etc/cron.daily/apt</literal> script. See header of this script for " +"the brief documentation of these options." +msgstr "" +"<literal>APT::Periodic</literal>- und <literal>APT::Archives</literal>-" +"Gruppen von Optionen konfigurieren das Verhalten periodischer APT-" +"Aktualisierungen, die vom Skript <literal>/etc/cron.daily/apt</literal> " +"durchgef??hrt werden. Lesen Sie die Kopfzeilen dieses Skripts, um eine kurze " +"Dokumentation dieser Optionen zu erhalten." + +#. type: Content of: <refentry><refsect1><title> +#: apt.conf.5.xml:588 +msgid "Debug options" +msgstr "Fehlersuchoptionen" + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:590 +msgid "" +"Enabling options in the <literal>Debug::</literal> section will cause " +"debugging information to be sent to the standard error stream of the program " +"utilizing the <literal>apt</literal> libraries, or enable special program " +"modes that are primarily useful for debugging the behavior of <literal>apt</" +"literal>. Most of these options are not interesting to a normal user, but a " +"few may be:" +msgstr "" +"Einschalten von Optionen im Abschnitt <literal>Debug::</literal> wird " +"veranlassen, dass Fehlersuchinformationen an die Standardfehlerausgabe des " +"Programms gesendet werden, das die <literal>apt</literal>-Bibliotheken " +"benutzt oder besondere Programmmodi einschaltet, die in erster Linie f??r " +"das Fehlersuchverhalten von <literal>apt</literal> n??tzlich sind. Die " +"meisten dieser Optionen sind f??r den normalen Anwender uninteressant, aber " +"ein paar k??nnten es sein:" + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:601 +msgid "" +"<literal>Debug::pkgProblemResolver</literal> enables output about the " +"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" +"literal>." +msgstr "" +"<literal>Debug::pkgProblemResolver</literal> schaltet die Ausgabe ??ber die " +"von <literal>dist-upgrade, upgrade, install, remove, purge</literal> " +"getroffenen Entscheidungen ein." + +#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> +#: apt.conf.5.xml:609 +msgid "" +"<literal>Debug::NoLocking</literal> disables all file locking. This can be " +"used to run some operations (for instance, <literal>apt-get -s install</" +"literal>) as a non-root user." +msgstr "" +"<literal>Debug::NoLocking</literal> schaltet jegliches Sperren von Dateien " +"aus. Dies kann benutzt werden, um einige Operationen (zum Beispiel " +"<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:618 +msgid "" +"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " +"time that <literal>apt</literal> invokes &dpkg;." +msgstr "" +"<literal>Debug::pkgDPkgPM</literal> gibt die aktuelle Befehlszeile jedesmal " +"aus, wenn <literal>apt</literal> &dpkg; aufruft." + +#. TODO: provide a +#. 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:626 +msgid "" +"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " +"in CDROM IDs." +msgstr "" +"<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-" +"Daten in CDROM-IDs aus." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:636 +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:641 +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:645 +msgid "" +"Print information related to accessing <literal>cdrom://</literal> sources." +msgstr "" +"Gibt Informationen aus, die sich auf Zugriffe von <literal>cdrom://</" +"literal>-Quellen beziehen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:652 +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:656 +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:663 +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:667 +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:674 +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:678 +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:685 +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:689 +msgid "" +"Print information related to verifying cryptographic signatures using " +"<literal>gpg</literal>." +msgstr "" +"Gibt Informationen aus, die sich auf das Pr??fen kryptografischer Signaturen " +"mittels <literal>gpg</literal> beziehen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:696 +msgid "<literal>Debug::aptcdrom</literal>" +msgstr "<literal>Debug::aptcdrom</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:700 +msgid "" +"Output information about the process of accessing collections of packages " +"stored on CD-ROMs." +msgstr "" +"Informationen ??ber den Zugriffsprozess auf Paketsammlungen ausgeben, die " +"auf CD-ROMs gespeichert sind." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:707 +msgid "<literal>Debug::BuildDeps</literal>" +msgstr "<literal>Debug::BuildDeps</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:710 +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:717 +msgid "<literal>Debug::Hashes</literal>" +msgstr "<literal>Debug::Hashes</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:720 +msgid "" +"Output each cryptographic hash that is generated by the <literal>apt</" +"literal> libraries." +msgstr "" +"Jeden kryptografischen Hash ausgeben, der von den <literal>apt</literal>-" +"Bibliotheken generiert wurde." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:727 +msgid "<literal>Debug::IdentCDROM</literal>" +msgstr "<literal>Debug::IdentCDROM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:730 +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 " +"a CD-ROM." +msgstr "" +"Keine Informationen von <literal>statfs</literal> einschlie??en, und zwar " +"die Anzahl der benutzten und freien Bl??cke auf dem CD-ROM-Dateisystem, wenn " +"eine ID f??r eine CD-ROM generiert wird." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:738 +msgid "<literal>Debug::NoLocking</literal>" +msgstr "<literal>Debug::NoLocking</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:741 +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 "" +"Jegliches Sperren von Dateien ausschalten. Dies wird zum Beispiel erlauben, " +"dass zwei Instanzen von <quote><literal>apt-get update</literal></quote> zur " +"gleichen Zeit laufen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:749 +msgid "<literal>Debug::pkgAcquire</literal>" +msgstr "<literal>Debug::pkgAcquire</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:753 +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:760 +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:763 +msgid "" +"Output status messages and errors related to verifying checksums and " +"cryptographic signatures of downloaded files." +msgstr "" +"Statusmeldungen und Fehler ausgeben, die sich auf das Pr??fen von Pr??" +"fsummen und kryptografischen Signaturen von heruntergeladenen Dateien " +"beziehen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:770 +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:773 +msgid "" +"Output information about downloading and applying package index list diffs, " +"and errors relating to package index list diffs." +msgstr "" +"Informationen ??ber das Herunterladen und Anwenden von Paketindexlisten-" +"Diffs und Fehler, die die Paketindexlisten-Diffs betreffen, ausgeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:781 +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:785 +msgid "" +"Output information related to patching apt package lists when downloading " +"index diffs instead of full indices." +msgstr "" +"Informationen ausgeben, die sich auf das Patchen von Paketlisten von APT " +"beziehen, wenn Index-Diffs anstelle vollst??ndiger Indizes heruntergeladen " +"werden." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:792 +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:796 +msgid "" +"Log all interactions with the sub-processes that actually perform downloads." +msgstr "" +"Alle Interaktionen mit Unterprozessen protokollieren, die aktuell Downloads " +"durchf??hren." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:803 +msgid "<literal>Debug::pkgAutoRemove</literal>" +msgstr "<literal>Debug::pkgAutoRemove</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:807 +msgid "" +"Log events related to the automatically-installed status of packages and to " +"the removal of unused packages." +msgstr "" +"Alle Ereignisse protokollieren, die sich auf den automatisch-installiert-" +"Status von Paketen und auf das Entfernen von nicht benutzten Paketen " +"beziehen." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:814 +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:817 +msgid "" +"Generate debug messages describing which packages are being automatically " +"installed to resolve dependencies. This corresponds to the initial auto-" +"install pass performed in, e.g., <literal>apt-get install</literal>, and not " +"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::" +"pkgProblemResolver</literal> for that." +msgstr "" +"Fehlersuchmeldungen generieren, die beschreiben, welche Pakete automatisch " +"installiert werden, um Abh??ngigkeiten aufzul??sen. Dies entspricht dem " +"anfangs durchgef??hrten auto-install-Durchlauf, z.B. in <literal>apt-get " +"install</literal> und nicht dem vollst??ndigen <literal>apt</literal>-Abh??" +"ngigkeitsaufl??ser. Lesen Sie daf??r <literal>Debug::pkgProblemResolver</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:828 +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:831 +msgid "" +"Generate debug messages describing which package is marked as keep/install/" +"remove while the ProblemResolver does his work. Each addition or deletion " +"may trigger additional actions; they are shown indented two additional space " +"under the original entry. The format for each line is <literal>MarkKeep</" +"literal>, <literal>MarkDelete</literal> or <literal>MarkInstall</literal> " +"followed by <literal>package-name <a.b.c -> d.e.f | x.y.z> (section)" +"</literal> where <literal>a.b.c</literal> is the current version of the " +"package, <literal>d.e.f</literal> is the version considered for installation " +"and <literal>x.y.z</literal> is a newer version, but not considered for " +"installation (because of a low pin score). The later two can be omitted if " +"there is none or if it is the same version as the installed. " +"<literal>section</literal> is the name of the section the package appears in." +msgstr "" +"Generiert Fehlersuchmeldungen, die beschreiben, welches Paket als keep/" +"install/remove markiert ist, w??hren der ProblemResolver seine Arbeit " +"verrichtet. Jedes Hinzuf??gen oder L??schen kann zus??tzliche Aktionen ausl??" +"sen. Sie werden nach zwei einger??ckten Leerzeichen unter dem " +"Originaleintrag angezeigt. Jede Zeile hat das Format <literal>MarkKeep</" +"literal>, <literal>MarkDelete</literal> oder <literal>MarkInstall</literal> " +"gefolgt von <literal>Paketname <a.b.c -> d.e.f | x.y.z> (Abschnitt)" +"</literal> wobei <literal>a.b.c</literal> die aktuelle Version des Paketes " +"ist, <literal>d.e.f</literal> die Version ist, die zur Installation " +"vorgesehen ist und <literal>x.y.z</literal> eine neuere Version ist, die " +"aber nicht zur Installation vorgesehen ist (aufgrund einer niedrigen Pinning-" +"Bewertung). Die letzten beiden k??nnen weggelassen werden, wenn es keine " +"gibt oder wenn sie die gleiche Version haben, wie die, die installiert ist. " +"<literal>section</literal> ist der Name des Abschnitts, in dem das Paket " +"erscheint." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:850 +msgid "<literal>Debug::pkgInitConfig</literal>" +msgstr "<literal>Debug::pkgInitConfig</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:853 +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:860 +msgid "<literal>Debug::pkgDPkgPM</literal>" +msgstr "<literal>Debug::pkgDPkgPM</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:863 +msgid "" +"When invoking &dpkg;, output the precise command line with which it is being " +"invoked, with arguments separated by a single space character." +msgstr "" +"Wenn &dpkg; aufgerufen wird, Ausgabe der genauen Befehlszeile mit der es " +"aufgerufen wurde, mit Argumenten, die durch einzelne Leerzeichen getrennt " +"sind." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:871 +msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" +msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:874 +msgid "" +"Output all the data received from &dpkg; on the status file descriptor and " +"any errors encountered while parsing it." +msgstr "" +"Alle von &dpkg; empfangenen Daten ??ber einen Status-Datei-Deskriptor und " +"alle w??hrend deren Auswertung gefundenen Fehler ausgeben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:881 +msgid "<literal>Debug::pkgOrderList</literal>" +msgstr "<literal>Debug::pkgOrderList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:885 +msgid "" +"Generate a trace of the algorithm that decides the order in which " +"<literal>apt</literal> should pass packages to &dpkg;." +msgstr "" +"Eine Aufzeichnung des Algorithmus generieren, der ??ber die Reihenfolge " +"entscheidet, in der <literal>apt</literal> Pakete an &dpkg; weiterleiten " +"soll." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:893 +msgid "<literal>Debug::pkgPackageManager</literal>" +msgstr "<literal>Debug::pkgPackageManager</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:897 +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." +msgstr "" +"Statusmeldungen ausgeben, die die Schritte nachverfolgen, die beim Aufruf " +"von &dpkg; ausgef??hrt werden." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:904 +msgid "<literal>Debug::pkgPolicy</literal>" +msgstr "<literal>Debug::pkgPolicy</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:908 +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:914 +msgid "<literal>Debug::pkgProblemResolver</literal>" +msgstr "<literal>Debug::pkgProblemResolver</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:918 +msgid "" +"Trace the execution of the dependency resolver (this applies only to what " +"happens when a complex dependency problem is encountered)." +msgstr "" +"Die Ausf??hrung des Abh??ngigkeitenverfolgers aufzeichnen (dies wird nur auf " +"das angewandt, was geschieht, wenn ein komplexes Abh??ngigkeitsproblem " +"aufgetreten ist)." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:926 +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:929 +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 " +"described in <literal>Debug::pkgDepCache::Marker</literal>" +msgstr "" +"Eine Liste aller installierten Pakete mit ihren berechneten Bewertungen, die " +"vom pkgProblemResolver benutzt werden, ausgeben. Die Beschreibung des Pakets " +"ist die gleiche, wie in <literal>Debug::pkgDepCache::Marker</literal> " +"beschrieben." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt.conf.5.xml:937 +msgid "<literal>Debug::sourceList</literal>" +msgstr "<literal>Debug::sourceList</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:941 +msgid "" +"Print information about the vendors read from <filename>/etc/apt/vendors." +"list</filename>." +msgstr "" +"Die Informationen ??ber die in <filename>/etc/apt/vendors.list</filename> " +"gelesenen Anbieter ausgeben." + +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:963 +msgid "" +"&configureindex; is a configuration file showing example values for all " +"possible options." +msgstr "" +"&configureindex; ist eine Konfigurationsdatei, die Beispielwerte f??r alle " +"m??glichen Optionen zeigen." + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt.conf.5.xml:970 +msgid "&file-aptconf;" +msgstr "&file-aptconf;" + +#. ? reading apt.conf +#. type: Content of: <refentry><refsect1><para> +#: apt.conf.5.xml:975 +msgid "&apt-cache;, &apt-config;, &apt-preferences;." +msgstr "&apt-cache;, &apt-config;, &apt-preferences;." + +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt_preferences.5.xml:13 +msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgstr "&apt-author.team; &apt-email; &apt-product; <date>04. Mai 2009</date>" + +#. type: Content of: <refentry><refnamediv><refname> +#: apt_preferences.5.xml:21 apt_preferences.5.xml:28 +msgid "apt_preferences" +msgstr "apt_preferences" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: apt_preferences.5.xml:29 +msgid "Preference control file for APT" +msgstr "Voreinstellungssteuerdatei f??r APT" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:34 +msgid "" +"The APT preferences file <filename>/etc/apt/preferences</filename> and the " +"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder " +"can be used to control which versions of packages will be selected for " +"installation." +msgstr "" +"Die APT-Einstellungsdatei <filename>/etc/apt/preferences</filename> und " +"Teildateien im Verzeichnis <filename>/etc/apt/preferences.d/</filename> k??" +"nnen benutzt werden, um zu steuern, welcher Versionen von Paketen zur " +"Installation ausgew??hlt werden." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:39 +msgid "" +"Several versions of a package may be available for installation when the " +"&sources-list; file contains references to more than one distribution (for " +"example, <literal>stable</literal> and <literal>testing</literal>). APT " +"assigns a priority to each version that is available. Subject to dependency " +"constraints, <command>apt-get</command> selects the version with the highest " +"priority for installation. The APT preferences file overrides the " +"priorities that APT assigns to package versions by default, thus giving the " +"user control over which one is selected for installation." +msgstr "" +"Es k??nnten mehrere Versionen eines Pakets zur Installation verf??gbar sein, " +"wenn die Datei &sources-list; Bez??ge zu mehr als einer Distribution enth??" +"lt (zum Beispiel <literal>stable</literal> und <literal>testing</literal>). " +"APT weist jeder verf??gbaren Version eine Priorit??t zu. Abh??ngig von Abh??" +"ngigkeitsbedingungen, w??hlt <command>apt-get</command> die Version mit der " +"h??chsten Priorit??t zur Installation aus. Die APT-Einstellungsdatei ??" +"berschreibt die Priorit??ten, die APT den Paketversionen standardm????ig " +"zuweist, was dem Anwender die Kontrolle dar??ber gibt, welche zur " +"Installation ausgew??hlt wird." + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:49 +msgid "" +"Several instances of the same version of a package may be available when the " +"&sources-list; file contains references to more than one source. In this " +"case <command>apt-get</command> downloads the instance listed earliest in " +"the &sources-list; file. The APT preferences file does not affect the " +"choice of instance, only the choice of version." +msgstr "" +"Es k??nnten mehrere Instanzen der gleichen Version eines Paketes verf??gbar " +"sein, wenn die Datei &sources-list; Bez??ge zu mehr als einer Distribution " +"enth??lt. In diesem Fall l??dt <command>apt-get</command> die Instanz " +"herunter, die in der Datei &sources-list; als erstes aufgelistet ist. Die " +"APT-Einstellungsdatei beeinflusst die Wahl der Instanz nicht, nur die Wahl " +"der Version." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:56 +msgid "APT's Default Priority Assignments" +msgstr "APTs Standardpriorit??tszuweisungen" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:71 +#, no-wrap +msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" +msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:74 +#, no-wrap +msgid "APT::Default-Release \"stable\";\n" +msgstr "APT::Default-Release \"stable\";\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:58 +msgid "" +"If there is no preferences file or if there is no entry in the file that " +"applies to a particular version then the priority assigned to that version " +"is the priority of the distribution to which that version belongs. It is " +"possible to single out a distribution, \"the target release\", which " +"receives a higher priority than other distributions do by default. The " +"target release can be set on the <command>apt-get</command> command line or " +"in the APT configuration file <filename>/etc/apt/apt.conf</filename>. Note " +"that this has precedence over any general priority you set in the <filename>/" +"etc/apt/preferences</filename> file described later, but not over " +"specifically pinned packages. For example, <placeholder type=" +"\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" +msgstr "" +"Wenn es keine Einstellungsdatei gibt oder es in der Datei keinen Eintrag " +"gibt, der sich auf eine bestimmte Version bezieht, dann ist die dieser " +"Version zugewiesene Priorit??t, die Priorit??t der Distribution zu der die " +"Version geh??rt. Es ist m??glich eine Distribution auszuzeichnen, ??das Ziel-" +"Release??, die eine h??here Priorit??t erh??lt, als dies andere " +"Distributionen standardm????ig tun. Das Ziel-Release kann auf der " +"<command>apt-get</command>-Befehlszeile oder in der APT-Konfigurationsdatei " +"<filename>/etc/apt/apt.conf</filename> gesetzt werden. Beachten Sie, dass " +"dies Vorrang vor einer allgemeinen Priorit??t hat, die Sie, wie sp??ter " +"beschrieben, in der Datei <filename>/etc/apt/preferences</filename> setzen, " +"aber nicht vor bestimmten mit Pinning gewichteten Paketen. Beispielsweise " +"<placeholder type=\"programlisting\" id=\"0\"/> <placeholder type=" +"\"programlisting\" id=\"1\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:83 +msgid "priority 100" +msgstr "Priorit??t 100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:84 +msgid "to the version that is already installed (if any)." +msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:88 +msgid "priority 500" +msgstr "Priorit??t 500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:89 +msgid "" +"to the versions that are not installed and do not belong to the target " +"release." +msgstr "" +"zu den Versionen, die nicht installiert sind und die nicht zum Ziel-Release " +"geh??ren." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:93 +msgid "priority 990" +msgstr "Priorit??t 990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:94 +msgid "" +"to the versions that are not installed and belong to the target release." +msgstr "" +"zu den Versionen, die nicht installiert sind und zum Ziel-Release geh??ren." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:78 +msgid "" +"If the target release has been specified then APT uses the following " +"algorithm to set the priorities of the versions of a package. Assign: " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Wenn das Ziel-Release angegeben wurde, dann benutzt APT den folgenden " +"Algorithmus, um die Priorit??ten der Versionen eines Paketes zu setzen. " +"Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:99 +msgid "" +"If the target release has not been specified then APT simply assigns " +"priority 100 to all installed package versions and priority 500 to all " +"uninstalled package versions." +msgstr "" +"Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen " +"installierten Paketversionen eine Priorit??t von 100 und allen nicht " +"installierten Paketversionen eine Priorit??t von 500 zu." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:103 +msgid "" +"APT then applies the following rules, listed in order of precedence, to " +"determine which version of a package to install." +msgstr "" +"APT wendet dann die folgenden Regeln an, aufgelistet in der Reihenfolge " +"ihres Vorrangs, um zu bestimmen in welcher Version das Paket zu installieren " +"ist." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:106 +msgid "" +"Never downgrade unless the priority of an available version exceeds 1000. " +"(\"Downgrading\" is installing a less recent version of a package in place " +"of a more recent version. Note that none of APT's default priorities " +"exceeds 1000; such high priorities can only be set in the preferences file. " +"Note also that downgrading a package can be risky.)" +msgstr "" +"F??hren Sie niemals ein Downgrade durch, au??er wenn die Priorit??t verf??" +"gbarer Pakete 1000 ??bersteigt. ??Downgrading?? ist das Installieren einer " +"weniger aktuellen Version, an Stelle einer aktuelleren Version. Beachten " +"Sie, dass keine Standardpriorit??t von APT 1000 ??bersteigt. So hohe " +"Priorit??ten k??nnen nur durch die Einstellungsdatei gesetzt werden. " +"Beachten Sie au??erdem, dass Downgrading eines Paketes riskant sein kann.)" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:112 +msgid "Install the highest priority version." +msgstr "Die Version mit der h??chsten Priorit??t installieren." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:113 +msgid "" +"If two or more versions have the same priority, install the most recent one " +"(that is, the one with the higher version number)." +msgstr "" +"Wenn zwei oder mehr Versionen die gleiche Priorit??t haben, wird die " +"aktuellste installiert (das ist die mit der h??heren Versionsnummer)." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:116 +msgid "" +"If two or more versions have the same priority and version number but either " +"the packages differ in some of their metadata or the <literal>--reinstall</" +"literal> option is given, install the uninstalled one." +msgstr "" +"Wenn zwei oder mehr Versionen die gleiche Priorit??t und Versionsnummer " +"haben, die Pakete sich aber entweder in ihren Metadaten unterscheiden oder " +"die Option <literal>--reinstall</literal> angegeben wurde, wird die nicht " +"installierte installiert." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:122 +msgid "" +"In a typical situation, the installed version of a package (priority 100) " +"is not as recent as one of the versions available from the sources listed in " +"the &sources-list; file (priority 500 or 990). Then the package will be " +"upgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"In einer typischen Situation ist die Version eines Paketes (Priorit??t 100) " +"nicht so aktuell, wie eine der verf??gbaren Versionen, die in der Quellliste " +"der Datei &sources-list; steht (Priorit??t 500 oder 900). Dann wird ein " +"Upgrade des Pakets durchgef??hrt, wenn <command>apt-get install " +"<replaceable>irgendein_Paket</replaceable></command> oder <command>apt-get " +"upgrade</command> ausgef??hrt wird." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:129 +msgid "" +"More rarely, the installed version of a package is <emphasis>more</emphasis> " +"recent than any of the other available versions. The package will not be " +"downgraded when <command>apt-get install <replaceable>some-package</" +"replaceable></command> or <command>apt-get upgrade</command> is executed." +msgstr "" +"Seltener ist die installierte Version eines Pakets <emphasis>neuer</" +"emphasis>, als jede andere der verf??gbaren Versionen. F??r das Paket wird " +"kein Downgrade durchgef??hrt, wenn <command>apt-get install " +"<replaceable>irgendein_Paket</replaceable></command> oder <command>apt-get " +"upgrade</command> ausgef??hrt wird." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:134 +msgid "" +"Sometimes the installed version of a package is more recent than the version " +"belonging to the target release, but not as recent as a version belonging to " +"some other distribution. Such a package will indeed be upgraded when " +"<command>apt-get install <replaceable>some-package</replaceable></command> " +"or <command>apt-get upgrade</command> is executed, because at least " +"<emphasis>one</emphasis> of the available versions has a higher priority " +"than the installed version." +msgstr "" +"Manchmal ist die installierte Version eines Pakets aktueller, als die " +"Version, die zum Ziel-Release geh??rt, aber nicht so aktuell, wie eine " +"Version, die zu einer anderen Distribution geh??rt. F??r ein derartiges " +"Paket wird tats??chlich ein Upgrade durchgef??hrt, wenn <command>apt-get " +"install <replaceable>irgendein_Paket</replaceable></command> oder " +"<command>apt-get upgrade</command> ausgef??hrt wird, weil mindestens " +"<emphasis>eine</emphasis> der verf??gbaren Versionen eine h??here Priorit??t " +"als die installierte Version hat." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:143 +msgid "The Effect of APT Preferences" +msgstr "Die Auswirkungen von APT-Einstellungen" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:145 +msgid "" +"The APT preferences file allows the system administrator to control the " +"assignment of priorities. The file consists of one or more multi-line " +"records separated by blank lines. Records can have one of two forms, a " +"specific form and a general form." +msgstr "" +"Die APT-Einstellungsdatei erlaubt einem Systemverwalter die Zuweisung von " +"Priorit??ten zu steuern. Die Datei besteht aus einem oder mehreren " +"mehrzeiligen Datens??tzen, die durch leere Zeilen getrennt sind. Datens??tze " +"k??nnen eine von zwei Gestalten haben, eine spezielle Gestalt oder eine " +"allgemeine Gestalt." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:151 +msgid "" +"The specific form assigns a priority (a \"Pin-Priority\") to one or more " +"specified packages and specified version or version range. For example, the " +"following record assigns a high priority to all versions of the " +"<filename>perl</filename> package whose version number begins with " +"\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." +msgstr "" +"Die spezielle Form weist die Priorit??t (eine ??Pin-Priorit??t??) einem oder " +"mehreren angegebenen Paketen und angegebenen Versionen oder " +"Versionsbereichen zu. Der folgende Datensatz weist zum Beispiel allen " +"Versionen des <filename>perl</filename>-Pakets eine h??here Priorit??t zu, " +"deren Versionsnummer mit ??<literal>5.8</literal>?? beginnt. Mehrere Pakete " +"k??nnen durch Leerzeichen getrennt werden." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:158 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:164 +msgid "" +"The general form assigns a priority to all of the package versions in a " +"given distribution (that is, to all the versions of packages that are listed " +"in a certain <filename>Release</filename> file) or to all of the package " +"versions coming from a particular Internet site, as identified by the site's " +"fully qualified domain name." +msgstr "" +"Die allgemeine Form weist allen Paketversionen in einer gegebenen " +"Distribution (d.h. alle Versionen von Paketen, die in einer bestimmten " +"<filename>Release</filename>-Datei gelistet sind) oder allen Paketversionen, " +"die von einer speziellen Internet-Site kommen, die durch ihren voll " +"ausgebildeten Dom??nennamen identifiziert wird, eine Priorit??t zu." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:170 +msgid "" +"This general-form entry in the APT preferences file applies only to groups " +"of packages. For example, the following record assigns a high priority to " +"all package versions available from the local site." +msgstr "" +"Dieser Eintrag in allgemeiner Form in der APT-Einstellungsdatei verwendet " +"nur Gruppen von Paketen. Der folgende Eintrag weist zum Beispiel allen " +"Paketversionen eine hohe Priorit??t zu, die lokale liegen." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:175 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +msgstr "" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:180 +msgid "" +"A note of caution: the keyword used here is \"<literal>origin</literal>\". " +"This should not be confused with the Origin of a distribution as specified " +"in a <filename>Release</filename> file. What follows the \"Origin:\" tag in " +"a <filename>Release</filename> file is not an Internet address but an author " +"or vendor name, such as \"Debian\" or \"Ximian\"." +msgstr "" +"Ein Wort der Warnung: Das hier benutzte Schl??sselwort ist ??" +"<literal>origin</literal>??. Dies sollte nicht mit der Herkunft einer " +"Distribution verwechselt werden, wie sie in einer <filename>Release</" +"filename>-Datei angegeben wurde. Was dem ??Origin:??-Kennzeichen in einer " +"<filename>Release</filename>-Datei folgt, ist keine Internet-Adresse, " +"sondern ein Autoren- oder Anbietername, wie ??Debian?? oder ??Ximian??." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:186 +msgid "" +"The following record assigns a low priority to all package versions " +"belonging to any distribution whose Archive name is \"<literal>unstable</" +"literal>\"." +msgstr "" +"Der folgende Datensatz weist allen Paketversionen, die zu Distributionen " +"geh??ren, deren Archivname ??<literal>unstable</literal>?? ist, eine " +"niedrige Priorit??t zu." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:190 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:195 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any distribution whose Codename is \"<literal>squeeze</literal>" +"\"." +msgstr "" +"Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution " +"geh??ren, deren Codename ??<literal>squeeze</literal>?? ist, eine hohe " +"Priorit??t zu." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:199 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +msgstr "" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:204 +msgid "" +"The following record assigns a high priority to all package versions " +"belonging to any release whose Archive name is \"<literal>stable</literal>\" " +"and whose release Version number is \"<literal>3.0</literal>\"." +msgstr "" +"Der folgende Datensatz weist allen Paketversionen, die zu einer Distribution " +"geh??ren, deren Archivname ??<literal>stable</literal>?? und deren Release-" +"Nummer ??<literal>3.0</literal>?? ist, eine hohe Priorit??t zu." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> +#: apt_preferences.5.xml:209 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" +msgstr "" +"Package: *\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:220 +msgid "How APT Interprets Priorities" +msgstr "Wie APT Priorit??ten interpretiert" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:228 +msgid "P > 1000" +msgstr "P > 1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:229 +msgid "" +"causes a version to be installed even if this constitutes a downgrade of the " +"package" +msgstr "" +"veranlasst, dass eine Version installiert wird, auch wenn dies ein Downgrade " +"des Pakets durchf??hrt" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:233 +msgid "990 < P <=1000" +msgstr "990 < P <=1000" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:234 +msgid "" +"causes a version to be installed even if it does not come from the target " +"release, unless the installed version is more recent" +msgstr "" +"veranlasst, dass eine Version installiert wird, auch wenn diese nicht vom " +"Ziel-Release kommt, au??er wenn die installierte Version aktueller ist" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:239 +msgid "500 < P <=990" +msgstr "500 < P <=990" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:240 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to the target release or the installed version is more recent" +msgstr "" +"veranlasst, dass eine Version installiert wird, au??er wenn eine Version " +"verf??gbar ist, die zum Ziel-Release geh??rt oder die installierte Version " +"neuer ist" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:245 +msgid "100 < P <=500" +msgstr "100 < P <=500" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:246 +msgid "" +"causes a version to be installed unless there is a version available " +"belonging to some other distribution or the installed version is more recent" +msgstr "" +"veranlasst, dass eine Version installiert wird, au??er wenn eine Version " +"verf??gbar ist, die zu einer anderen Distribution geh??rt oder die " +"installierte Version neuer ist" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:251 +msgid "0 < P <=100" +msgstr "0 < P <=100" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:252 +msgid "" +"causes a version to be installed only if there is no installed version of " +"the package" +msgstr "" +"veranlasst, dass eine Version nur dann installiert wird, wenn es keine " +"installierte Version des Pakets gibt" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:256 +msgid "P < 0" +msgstr "P < 0" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:257 +msgid "prevents the version from being installed" +msgstr "verhindert das Installieren der Version" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:223 +msgid "" +"Priorities (P) assigned in the APT preferences file must be positive or " +"negative integers. They are interpreted as follows (roughly speaking): " +"<placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Die in der APT-Einstellungsdatei zugewiesenen Priorit??ten (P) m??ssen " +"positive oder negative Ganzzahlen sein. Sie werden wie folgt interpretiert " +"(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:262 +msgid "" +"If any specific-form records match an available package version then the " +"first such record determines the priority of the package version. Failing " +"that, if any general-form records match an available package version then " +"the first such record determines the priority of the package version." +msgstr "" +"Wenn irgendwelche Datens??tze mit speziellem Format zu einer verf??gbaren " +"Paketversion passen, dann legt der erste dieser Datens??tze die Priorit??t " +"der Paketversion fest. Schl??gt dies fehl und es passen irgendwelche Datens??" +"tze mit allgemeinem Format zu einer verf??gbaren Paketversion, dann legt der " +"erste dieser Datens??tze die Priorit??t der Paketversion fest." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:268 +msgid "" +"For example, suppose the APT preferences file contains the three records " +"presented earlier:" +msgstr "" +"Nehmen wir zum Beispiel an, die APT-Einstellungsdatei enth??lt die drei " +"bereits gezeigten Datens??tze:" + +#. type: Content of: <refentry><refsect1><refsect2><programlisting> +#: apt_preferences.5.xml:272 +#, no-wrap +msgid "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" +msgstr "" +"Package: perl\n" +"Pin: version 5.8*\n" +"Pin-Priority: 1001\n" +"\n" +"Package: *\n" +"Pin: origin \"\"\n" +"Pin-Priority: 999\n" +"\n" +"Package: *\n" +"Pin: release unstable\n" +"Pin-Priority: 50\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:285 +msgid "Then:" +msgstr "Dann:" + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:287 +msgid "" +"The most recent available version of the <literal>perl</literal> package " +"will be installed, so long as that version's version number begins with " +"\"<literal>5.8</literal>\". If <emphasis>any</emphasis> 5.8* version of " +"<literal>perl</literal> is available and the installed version is 5.9*, then " +"<literal>perl</literal> will be downgraded." +msgstr "" +"Es wird die aktuellste verf??gbare Version des Pakets <literal>perl</" +"literal> installiert, so lange die Versionsnummer mit ??<literal>5.8</" +"literal>?? anf??ngt. Wenn <emphasis>irgendeine</emphasis> 5.8*-Version von " +"<literal>perl</literal>verf??gbar ist und die installierte Version 5.9* ist, " +"dann wird von <literal>perl</literal> ein Downgrade durchgef??hrt." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:292 +msgid "" +"A version of any package other than <literal>perl</literal> that is " +"available from the local system has priority over other versions, even " +"versions belonging to the target release." +msgstr "" +"Eine Version irgendeines anderen Pakets als <literal>perl</literal>, die vom " +"lokalen System verf??gbar ist, hat eine Priorit??t ??ber anderen Versionen, " +"sogar wenn diese Versionen zum Ziel-Release geh??ren." + +#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> +#: apt_preferences.5.xml:296 +msgid "" +"A version of a package whose origin is not the local system but some other " +"site listed in &sources-list; and which belongs to an <literal>unstable</" +"literal> distribution is only installed if it is selected for installation " +"and no version of the package is already installed." +msgstr "" +"Eine Version eines Pakets, dessen Ursprung nicht das lokale System ist, aber " +"ein anderer in &sources-list; aufgelisteter Ort und der zu einer " +"<literal>unstable</literal>-Distribution geh??rt. wird nur installiert, " +"falls es zur Installation ausgew??hlt wurde und nicht bereits eine Version " +"des Pakets installiert ist." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:306 +msgid "Determination of Package Version and Distribution Properties" +msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:308 +msgid "" +"The locations listed in the &sources-list; file should provide " +"<filename>Packages</filename> and <filename>Release</filename> files to " +"describe the packages available at that location." +msgstr "" +"Die in der &sources-list;-Datei aufgelisteten Orte sollten " +"<filename>Packages</filename>- und <filename>Release</filename>-Dateien " +"bereitstellen, um die an diesem Ort verf??gbaren Pakete zu beschreiben." + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:320 +msgid "the <literal>Package:</literal> line" +msgstr "die <literal>Package:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:321 +msgid "gives the package name" +msgstr "gibt den Paketnamen an" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:324 apt_preferences.5.xml:374 +msgid "the <literal>Version:</literal> line" +msgstr "die <literal>Version:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:325 +msgid "gives the version number for the named package" +msgstr "gibt die Versionsnummer f??r das genannte Paket an" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:312 +msgid "" +"The <filename>Packages</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable>/" +"<replaceable>component</replaceable>/<replaceable>arch</replaceable></" +"filename>: for example, <filename>.../dists/stable/main/binary-i386/" +"Packages</filename>. It consists of a series of multi-line records, one for " +"each package available in that directory. Only two lines in each record are " +"relevant for setting APT priorities: <placeholder type=\"variablelist\" id=" +"\"0\"/>" +msgstr "" +"Die <filename>Packages</filename>-Datei wird normalerweise im Verzeichnis " +"<filename>.../dists/<replaceable>Distributions-Name</replaceable>/" +"<replaceable>Komponente</replaceable>/<replaceable>Architektur</" +"replaceable></filename> gefunden, zum Beispiel <filename>.../dists/stable/" +"main/binary-i386/Packages</filename>. Sie besteht aus einer Serie " +"mehrzeiliger Datens??tze, einem f??r jedes verf??gbare Paket in diesem " +"Verzeichnis. In jedem Datensatz sind nur zwei Zeilen zum Setzen der APT-" +"Priorit??ten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:341 +msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" +msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:342 +msgid "" +"names the archive to which all the packages in the directory tree belong. " +"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " +"that all of the packages in the directory tree below the parent of the " +"<filename>Release</filename> file are in a <literal>stable</literal> " +"archive. Specifying this value in the APT preferences file would require " +"the line:" +msgstr "" +"benennt das Archiv, zu dem alle Pakete im Verzeichnisbaum geh??ren. Die " +"Zeile ??Archive: stable?? oder ??Suite: stable?? gibt zum Beispiel an, dass " +"alle Pakete im Verzeichnisbaum unterhalb des der <filename>Release</" +"filename>-Datei ??bergeordneten Verzeichnisses sich in einem " +"<literal>stable</literal>-Archiv befinden. Diesen Wert in der APT-" +"Einstellungsdatei anzugeben w??rde die folgende Zeile ben??tigen:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:352 +#, no-wrap +msgid "Pin: release a=stable\n" +msgstr "Pin: release a=stable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:358 +msgid "the <literal>Codename:</literal> line" +msgstr "die <literal>Codename:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:359 +msgid "" +"names the codename to which all the packages in the directory tree belong. " +"For example, the line \"Codename: squeeze\" specifies that all of the " +"packages in the directory tree below the parent of the <filename>Release</" +"filename> file belong to a version named <literal>squeeze</literal>. " +"Specifying this value in the APT preferences file would require the line:" +msgstr "" +"benennt den Codenamen, zu dem alle Pakete im Verzeichnisbaum geh??ren. Die " +"Zeile ??Codename: squeeze?? gibt zum Beispiel an, dass alle Pakete im " +"Verzeichnisbaum unterhalb des der <filename>Release</filename>-Datei ??" +"bergeordneten Verzeichnisses zu einer Version mit Namen <literal>squeeze</" +"literal> geh??ren. Diesen Wert in der APT-Einstellungsdatei anzugeben w??rde " +"die folgende Zeile ben??tigen:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:368 +#, no-wrap +msgid "Pin: release n=squeeze\n" +msgstr "Pin: release n=squeeze\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:375 +msgid "" +"names the release version. For example, the packages in the tree might " +"belong to Debian GNU/Linux release version 3.0. Note that there is normally " +"no version number for the <literal>testing</literal> and <literal>unstable</" +"literal> distributions because they have not been released yet. Specifying " +"this in the APT preferences file would require one of the following lines." +msgstr "" +"benennt die Release-Version. Die Pakete im Baum k??nnten zum Beispiel zur " +"Debian GNU/Linux-Release-Version 3.0 geh??ren. Beachten Sie, dass es " +"normalerweise keine Versionsnummer f??r <literal>testing</literal>- und " +"<literal>unstable</literal>-Distributionen gibt, weil sie noch nicht ver??" +"ffentlicht wurden. Diese in der APT-Einstellungsdatei anzugeben w??rde eine " +"der folgenden Zeilen ben??tigen:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:384 +#, no-wrap +msgid "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" +msgstr "" +"Pin: release v=3.0\n" +"Pin: release a=stable, v=3.0\n" +"Pin: release 3.0\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:393 +msgid "the <literal>Component:</literal> line" +msgstr "die <literal>Component:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:394 +msgid "" +"names the licensing component associated with the packages in the directory " +"tree of the <filename>Release</filename> file. For example, the line " +"\"Component: main\" specifies that all the packages in the directory tree " +"are from the <literal>main</literal> component, which entails that they are " +"licensed under terms listed in the Debian Free Software Guidelines. " +"Specifying this component in the APT preferences file would require the line:" +msgstr "" +"benennt die Lizenzierungskomponente, die mit den Paketen im Verzeichnisbaum " +"der <filename>Release</filename>-Datei verbunden ist. Die Zeile ??Component: " +"main?? gibt zum Beispiel an, dass alle Pakete im Verzeichnisbaum von der " +"<literal>main</literal>-Komponente stammen, was zur Folge hat, dass sie " +"unter den Bedingungen der Debian-Richtlinien f??r Freie Software stehen. " +"Diese Komponente in der APT-Einstellungsdatei anzugeben w??rde die folgende " +"Zeilen ben??tigen:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:403 +#, no-wrap +msgid "Pin: release c=main\n" +msgstr "Pin: release c=main\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:409 +msgid "the <literal>Origin:</literal> line" +msgstr "die <literal>Origin:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:410 +msgid "" +"names the originator of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this origin in the APT preferences file would require " +"the line:" +msgstr "" +"benennt den Urheber des Pakets im Verzeichnisbaum der <filename>Release</" +"filename>-Datei. Zumeist ist dies <literal>Debian</literal>. Diesen Ursprung " +"in der APT-Einstellungsdatei anzugeben w??rde die folgende Zeile ben??tigen:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:416 +#, no-wrap +msgid "Pin: release o=Debian\n" +msgstr "Pin: release o=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> +#: apt_preferences.5.xml:422 +msgid "the <literal>Label:</literal> line" +msgstr "die <literal>Label:</literal>-Zeile" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> +#: apt_preferences.5.xml:423 +msgid "" +"names the label of the packages in the directory tree of the " +"<filename>Release</filename> file. Most commonly, this is <literal>Debian</" +"literal>. Specifying this label in the APT preferences file would require " +"the line:" +msgstr "" +"benennt die Beschriftung des Pakets im Verzeichnisbaum der " +"<filename>Release</filename>-Datei. Zumeist ist dies <literal>Debian</" +"literal>. Diese Beschriftung in der APT-Einstellungsdatei anzugeben w??rde " +"die folgende Zeile ben??tigen:" + +#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> +#: apt_preferences.5.xml:429 +#, no-wrap +msgid "Pin: release l=Debian\n" +msgstr "Pin: release l=Debian\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:330 +msgid "" +"The <filename>Release</filename> file is normally found in the directory " +"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " +"example, <filename>.../dists/stable/Release</filename>, or <filename>.../" +"dists/woody/Release</filename>. It consists of a single multi-line record " +"which applies to <emphasis>all</emphasis> of the packages in the directory " +"tree below its parent. Unlike the <filename>Packages</filename> file, " +"nearly all of the lines in a <filename>Release</filename> file are relevant " +"for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Die <filename>Release</filename>-Datei ist normalerweise im Verzeichnis " +"<filename>.../dists/<replaceable>Distributionsname</replaceable></filename> " +"zu finden, zum Beispiel <filename>.../dists/stable/Release</filename> oder " +"<filename>.../dists/woody/Release</filename>. Es besteht aus einem einzelnen " +"mehrzeiligen Datensatz, der auf <emphasis>alle</emphasis> Pakete im " +"Verzeichnisbaum unterhalb des ??bergeordneten Verzeichnisses zutrifft. " +"Anders als die <filename>Packages</filename>-Datei sind nahezu alle Zeilen " +"in einer <filename>Release</filename>-Datei f??r das Setzen von APT-Priorit??" +"ten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:436 +msgid "" +"All of the <filename>Packages</filename> and <filename>Release</filename> " +"files retrieved from locations listed in the &sources-list; file are stored " +"in the directory <filename>/var/lib/apt/lists</filename>, or in the file " +"named by the variable <literal>Dir::State::Lists</literal> in the " +"<filename>apt.conf</filename> file. For example, the file <filename>debian." +"lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> " +"contains the <filename>Release</filename> file retrieved from the site " +"<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> " +"architecture files from the <literal>contrib</literal> component of the " +"<literal>unstable</literal> distribution." +msgstr "" +"Alle <filename>Packages</filename>- und <filename>Release</filename>-" +"Dateien, die von Orten heruntergeladen werden, die in der Datei &sources-" +"list; aufgelistet sind, werden im Verzeichnis <filename>/var/lib/apt/lists</" +"filename> oder in der von der Variablen <literal>Dir::State::Lists</literal> " +"in der Datei <filename>apt.conf</filename> benannten Datei gespeichert. Die " +"Datei <filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-" +"i386_Release</filename> enth??lt zum Beispiel die <filename>Release</" +"filename>-Datei, die von der Site <literal>debian.lcs.mit.edu</literal> f??r " +"die <literal>binary-i386</literal>-Architekturdateien von der " +"<literal>contrib</literal>-Komponente der <literal>unstable</literal>-" +"Distribution heruntergeladen wurde." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:449 +msgid "Optional Lines in an APT Preferences Record" +msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:451 +msgid "" +"Each record in the APT preferences file can optionally begin with one or " +"more lines beginning with the word <literal>Explanation:</literal>. This " +"provides a place for comments." +msgstr "" +"Optional kann jeder Datensatz im der APT-Einstellungsdatei mit einer oder " +"mehreren Zeilen beginnen, die mit dem Wort <literal>Explanation:</literal> " +"anfangen. Dieses stellt einen Platz f??r Kommentare bereit." + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:455 +msgid "" +"The <literal>Pin-Priority:</literal> line in each APT preferences record is " +"optional. If omitted, APT assigns a priority of 1 less than the last value " +"specified on a line beginning with <literal>Pin-Priority: release ...</" +"literal>." +msgstr "" +"Die <literal>Pin-Priority:</literal>-Zeile in jedem APT-" +"Einstellungsdatensatz ist optional. Wenn diese weggelassen wird, weist APT " +"ein Priorit??t zu, die um 1 kleiner ist, als der letzte Wert, der in einer " +"Zeile angegeben wurde, die mit <literal>Pin-Priority: release ...</literal> " +"anf??ngt." + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:464 +msgid "Tracking Stable" +msgstr "Stable verfolgen" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:472 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated\n" +"Explanation: package versions other than those in the stable distro\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" +"Explanation: stammenden Paketversionen, als denen der Stable-Distribution\n" +"Package: *\n" +"Pin: release a=stable\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:466 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"<literal>stable</literal> distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> " +"distributions. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Die folgende APT-Einstellungsdatei wird APT veranlassen, allen " +"Paketversionen eine h??here Priorit??t als die Vorgabe (500) zu geben, die " +"zu einer <literal>stable</literal>-Distribution geh??ren und eine ungeheuer " +"niedrige Priorit??t Paketversionen, die zu anderen <literal>Debian</literal>-" +"Distribution geh??ren. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:489 apt_preferences.5.xml:535 +#: apt_preferences.5.xml:593 +#, no-wrap +msgid "" +"apt-get install <replaceable>package-name</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" +msgstr "" +"apt-get install <replaceable>Paketname</replaceable>\n" +"apt-get upgrade\n" +"apt-get dist-upgrade\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:484 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" +"(n) <literal>stable</literal>-Version(en) durchzuf??hren. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:501 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/testing\n" +msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:495 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>testing</literal> distribution; the package " +"will not be upgraded again unless this command is given again. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets " +"auf die neuste Version der <literal>testing</literal>-Distribution durchzuf??" +"hren. Von dem Paket wird kein weiteres Upgrade durchgef??hrt, au??er wenn " +"dieser Befehl wieder angegeben wird. <placeholder type=\"programlisting\" id=" +"\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:507 +msgid "Tracking Testing or Unstable" +msgstr "Testing oder Unstable verfolgen" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:516 +#, no-wrap +msgid "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Package: *\n" +"Pin: release a=testing\n" +"Pin-Priority: 900\n" +"\n" +"Package: *\n" +"Pin: release a=unstable\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:509 +msgid "" +"The following APT preferences file will cause APT to assign a high priority " +"to package versions from the <literal>testing</literal> distribution, a " +"lower priority to package versions from the <literal>unstable</literal> " +"distribution, and a prohibitively low priority to package versions from " +"other <literal>Debian</literal> distributions. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"Die folgende APT-Einstellungsdatei wird APT veranlassen, Paketversionen der " +"<literal>testing</literal>-Distribution eine hohe Priorit??t, Paketversionen " +"der <literal>unstable</literal>-Distribution eine niedrigere Priorit??t und " +"eine ungeheuer niedrige Priorit??t zu Paketversionen von anderen " +"<literal>Debian</literal>-Distributionen zuzuweisen. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:530 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest " +"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " +"id=\"0\"/>" +msgstr "" +"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die neuste" +"(n) <literal>testing</literal>-Version(en) durchzuf??hren. <placeholder type=" +"\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:550 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/unstable\n" +msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:541 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>unstable</literal> distribution. " +"Thereafter, <command>apt-get upgrade</command> will upgrade the package to " +"the most recent <literal>testing</literal> version if that is more recent " +"than the installed version, otherwise, to the most recent <literal>unstable</" +"literal> version if that is more recent than the installed version. " +"<placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets " +"auf die neuste Version der <literal>unstable</literal>-Distribution " +"durchzuf??hren. Danach wird <command>apt-get upgrade</command> ein Upgrade " +"des Pakets auf die aktuellste <literal>testing</literal>-Version durchf??" +"hren, falls diese aktueller als die installierte Version ist, andernfalls " +"auf die aktuellste <literal>unstable</literal>-Version, wenn diese aktueller " +"als die installierte Version ist. <placeholder type=\"programlisting\" id=" +"\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><title> +#: apt_preferences.5.xml:557 +msgid "Tracking the evolution of a codename release" +msgstr "Die Entwicklung eines Codename-Releases verfolgen" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:571 +#, no-wrap +msgid "" +"Explanation: Uninstall or do not install any Debian-originated package versions\n" +"Explanation: other than those in the distribution codenamed with squeeze or sid\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian unstable is always codenamed with sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" +msgstr "" +"Explanation: Deinstallieren oder nicht installieren von anderen von Debian\n" +"Explanation: stammenden Paketversionen, als denen der Squeeze- oder Sid-Distribution\n" +"Package: *\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" +"\n" +"Explanation: Debian-Unstable hat immer den Codenamen sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" +"Package: *\n" +"Pin: release o=Debian\n" +"Pin-Priority: -10\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:559 +msgid "" +"The following APT preferences file will cause APT to assign a priority " +"higher than the default (500) to all package versions belonging to a " +"specified codename of a distribution and a prohibitively low priority to " +"package versions belonging to other <literal>Debian</literal> distributions, " +"codenames and archives. Note that with this APT preference APT will follow " +"the migration of a release from the archive <literal>testing</literal> to " +"<literal>stable</literal> and later <literal>oldstable</literal>. If you " +"want to follow for example the progress in <literal>testing</literal> " +"notwithstanding the codename changes you should use the example " +"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Die folgende APT-Einstellungsdatei wird APT veranlassen, allen Paketen, die " +"zu einem bestimmten Codenamen einer Distribution geh??ren, eine h??here " +"Priorit??t als die Vorgabe (500) zu geben und Paketversionen, die zu anderen " +"<literal>Debian</literal>-Distributionen, Codenamen und Archiven geh??ren, " +"eine ungeheuer niedrige Priorit??t zu geben. Beachten Sie, dass APT mit " +"diesen APT-Einstellungen der Migration eines Releases vom Archiv " +"<literal>testing</literal> zu <literal>stable</literal> und sp??ter zu " +"<literal>oldstable</literal> folgen wird. Wenn Sie zum Beispiel dem " +"Fortschritt in <literal>testing</literal> folgen m??chten, obwohl der " +"Codename sich ??ndert, sollten Sie die Beispielkonfigurationen oberhalb " +"benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:588 +msgid "" +"With a suitable &sources-list; file and the above preferences file, any of " +"the following commands will cause APT to upgrade to the latest version(s) in " +"the release codenamed with <literal>squeeze</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" +msgstr "" +"Mit einer geeigneten &sources-list;-Datei und der obigen Einstellungsdatei " +"wird jeder der folgenden Befehle APT veranlassen, ein Upgrade auf die letzte" +"(n) Version(en) im Release mit Codenamen <literal>squeeze</literal> " +"durchzuf??hren.<placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><refsect2><para><programlisting> +#: apt_preferences.5.xml:608 +#, no-wrap +msgid "apt-get install <replaceable>package</replaceable>/sid\n" +msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" + +#. type: Content of: <refentry><refsect1><refsect2><para> +#: apt_preferences.5.xml:599 +msgid "" +"The following command will cause APT to upgrade the specified package to the " +"latest version from the <literal>sid</literal> distribution. Thereafter, " +"<command>apt-get upgrade</command> will upgrade the package to the most " +"recent <literal>squeeze</literal> version if that is more recent than the " +"installed version, otherwise, to the most recent <literal>sid</literal> " +"version if that is more recent than the installed version. <placeholder " +"type=\"programlisting\" id=\"0\"/>" +msgstr "" +"Der folgende Befehl wird APT veranlassen, ein Upgrade des angegebenen Pakets " +"auf die letzte Version der <literal>sid</literal>-Distribution durchzuf??" +"hren. Danach wird <command>apt-get upgrade</command> ein Upgrade des Pakets " +"auf die aktuellste <literal>squeeze</literal>-Version durchf??hren, wenn " +"diese aktueller als die installierte Version ist, andernfalls auf die " +"aktuellste <literal>sid</literal>-Version, wenn diese aktueller als die " +"installierte Version ist. <placeholder type=\"programlisting\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><variablelist> +#: apt_preferences.5.xml:617 +msgid "&file-preferences;" +msgstr "&file-preferences;" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:623 +msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" + +#. type: Content of: <refentry><refnamediv><refname> +#: sources.list.5.xml:22 sources.list.5.xml:29 +msgid "sources.list" +msgstr "sources.list" + +#. type: Content of: <refentry><refnamediv><refpurpose> +#: sources.list.5.xml:30 +msgid "Package resource list for APT" +msgstr "Paketressourcenliste f??r APT" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:34 +msgid "" +"The package resource list is used to locate archives of the package " +"distribution system in use on the system. At this time, this manual page " +"documents only the packaging system used by the Debian GNU/Linux system. " +"This control file is located in <filename>/etc/apt/sources.list</filename>" +msgstr "" +"Die Paketquellenliste wird benutzt, um Archive des Paketverteilungssystems, " +"das auf dem System benutzt wird, zu finden. Momentan dokumentiert diese " +"Handbuchseite nur das vom Debian-GNU/Linux-System benutzte " +"Paketierungssystem. Die Steuerungsdatei befindet sich in <filename>/etc/apt/" +"sources.list</filename>." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:39 +msgid "" +"The source list is designed to support any number of active sources and a " +"variety of source media. The file lists one source per line, with the most " +"preferred source listed first. The format of each line is: <literal>type uri " +"args</literal> The first item, <literal>type</literal> determines the format " +"for <literal>args</literal> <literal>uri</literal> is a Universal Resource " +"Identifier (URI), which is a superset of the more specific and well-known " +"Universal Resource Locator, or URL. The rest of the line can be marked as a " +"comment by using a #." +msgstr "" +"Die Quellenliste wurde entworfen, um eine beliebige Anzahl von aktiven " +"Quellen und eine Vielzahl von Quellmedien zu unterst??tzen. Die Datei listet " +"eine Quelle pro Zeile auf, wobei die bevorzugten Quellen zuerst aufgelistet " +"sind. Das Format jeder Zeile lautet: <literal>Typ URI Argumente</literal>. " +"Das erste Element <literal>Typ</literal> legt das Format f??r " +"<literal>Argumente</literal> fest. <literal>URI</literal> ist ein " +"universeller Quellenbezeichner ??Universal Resource Identifier?? (URI), der " +"eine Obermenge des spezielleren und besser bekannten Universal Resource " +"Locator (URL) ist. Der Rest der Zeile kann unter Verwendung von # als " +"Kommentar markiert werden." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:50 +msgid "sources.list.d" +msgstr "sources.list.d" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:51 +msgid "" +"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to " +"add sources.list entries in separate files. The format is the same as for " +"the regular <filename>sources.list</filename> file. File names need to end " +"with <filename>.list</filename> and may only contain letters (a-z and A-Z), " +"digits (0-9), underscore (_), hyphen (-) and period (.) characters. " +"Otherwise they will be silently ignored." +msgstr "" +"Das Verzeichnis <filename>/etc/apt/sources.list.d</filename> stellt eine M??" +"glichkeit bereit, sources.list-Eintr??ge in separaten Dateien hinzuzuf??gen. " +"Das Format ist das gleiche wie f??r die normale <filename>sources.list</" +"filename>-Datei. Dateinamen m??ssen mit <filename>.list</filename> enden und " +"k??nnen nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), " +"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie " +"stillschweigend ignoriert." + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:60 +msgid "The deb and deb-src types" +msgstr "Die Typen deb und deb-src" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:61 +msgid "" +"The <literal>deb</literal> type describes a typical two-level Debian " +"archive, <filename>distribution/component</filename>. Typically, " +"<literal>distribution</literal> is generally one of <literal>stable</" +"literal> <literal>unstable</literal> or <literal>testing</literal> while " +"component is one of <literal>main</literal> <literal>contrib</literal> " +"<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-" +"src</literal> type describes a debian distribution's source code in the same " +"form as the <literal>deb</literal> type. A <literal>deb-src</literal> line " +"is required to fetch source indexes." +msgstr "" +"Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-" +"Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</" +"literal> ist typischerweise entweder <literal>stable</literal>, " +"<literal>unstable</literal> oder <literal>testing</literal>, w??hrend " +"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, " +"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der " +"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-" +"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine " +"<literal>deb-src</literal>-Zeile wird ben??tigt, um Quellindizes " +"herunterzuladen." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:73 +msgid "" +"The format for a <filename>sources.list</filename> entry using the " +"<literal>deb</literal> and <literal>deb-src</literal> types are:" +msgstr "" +"Das Format f??r einen <filename>sources.list</filename>-Eintrag, der die " +"<literal>deb</literal>- und <literal>deb-src</literal>-Typen benutzt, ist:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:76 +#, no-wrap +msgid "deb uri distribution [component1] [component2] [...]" +msgstr "deb URI Distribution [Komponente1] [Komponente2] [...]" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:78 +msgid "" +"The URI for the <literal>deb</literal> type must specify the base of the " +"Debian distribution, from which APT will find the information it needs. " +"<literal>distribution</literal> can specify an exact path, in which case the " +"components must be omitted and <literal>distribution</literal> must end with " +"a slash (/). This is useful for when only a particular sub-section of the " +"archive denoted by the URI is of interest. If <literal>distribution</" +"literal> does not specify an exact path, at least one <literal>component</" +"literal> must be present." +msgstr "" +"Die URI f??r den <literal>deb</literal>-Typ muss die Basis der Debian-" +"Distribution angeben, wo APT die Informationen findet, die es ben??tigt. " +"<literal>Distribution</literal> kann einen genauen Pfad angeben. In diesem " +"Fall m??ssen die Komponenten weggelassen werden und <literal>Distribution</" +"literal> muss mit einem Schr??gstrich (/) enden. Dies ist n??tzlich, wenn " +"nur ein bestimmter Unterabschnitt des von der URI angegebenen Archivs von " +"Interesse ist. Wenn <literal>Distribution</literal> keinen genauen Pfad " +"angibt, muss mindestens eine <literal>Komponente</literal> angegeben sein." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:87 +#, fuzzy +#| msgid "" +#| "<literal> distribution</literal> may also contain a variable, <literal>" +#| "$(ARCH)</literal> which expands to the Debian architecture (i386, m68k, " +#| "powerpc, ...) used on the system. This permits architecture-independent " +#| "<filename>sources.list</filename> files to be used. In general this is " +#| "only of interest when specifying an exact path, <literal>APT</literal> " +#| "will automatically generate a URI with the current architecture otherwise." +msgid "" +"<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" +"</literal> which expands to the Debian architecture (i386, m68k, " +"powerpc, ...) used on the system. This permits architecture-independent " +"<filename>sources.list</filename> files to be used. In general this is only " +"of interest when specifying an exact path, <literal>APT</literal> will " +"automatically generate a URI with the current architecture otherwise." +msgstr "" +"<literal> distribution</literal> k??nnte au??erdem eine Variable, <literal>" +"$(ARCH)</literal>, enthalten, die zur Debian-Architektur (i386, m68k, " +"powerpc, ...) expandiert wird, die auf dem System benutzt wird. Dies erlaubt " +"es, architekturabh??ngige <filename>sources.list</filename>-Dateien zu " +"benutzen. Im Allgemeinen ist dies nur von Interesse, wenn ein genauer Pfad " +"angegeben wird, andernfalls wird <literal>APT</literal> automatisch eine URI " +"mit der aktuellen Architektur generieren." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:95 +msgid "" +"Since only one distribution can be specified per line it may be necessary to " +"have multiple lines for the same URI, if a subset of all available " +"distributions or components at that location is desired. APT will sort the " +"URI list after it has generated a complete set internally, and will collapse " +"multiple references to the same Internet host, for instance, into a single " +"connection, so that it does not inefficiently establish an FTP connection, " +"close it, do something else, and then re-establish a connection to that same " +"host. This feature is useful for accessing busy FTP sites with limits on the " +"number of simultaneous anonymous users. APT also parallelizes connections to " +"different hosts to more effectively deal with sites with low bandwidth." +msgstr "" +"Da pro Zeile nur eine Distribution angegeben werden kann, k??nnte es n??tig " +"sein, mehrere Zeilen f??r die gleiche URI zu haben, falls eine Untermenge " +"aller verf??gbarer Distributionen oder Komponenten von diesem Ort gew??nscht " +"wird. APT wird die URI-Liste sortieren, nachdem es intern eine komplette " +"Zusammenstellung generiert hat und es wird mehrere Bez??ge zum gleichen " +"Internet-Host zusammenfassen, zum Beispiel zu einer einzigen Verbindung, so " +"dass es nicht ineffizient FTP-Verbindungen herstellt, sie schlie??t, sonst " +"etwas tut und dann erneut eine Verbindung zum gleichen Host herstellt. Diese " +"Funktion ist n??tzlich f??r den Zugriff auf ausgelastete FTP-Sites mit " +"Begrenzungen der Anzahl gleichzeitiger anonymer Anwender. APT parallelisiert " +"au??erdem Verbindungen zu verschiedenen Hosts, um effektiver mit Orten " +"niedriger Bandbreite hauszuhalten." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:107 +msgid "" +"It is important to list sources in order of preference, with the most " +"preferred source listed first. Typically this will result in sorting by " +"speed from fastest to slowest (CD-ROM followed by hosts on a local network, " +"followed by distant Internet hosts, for example)." +msgstr "" +"Es ist wichtig, die Quellen in der Reihenfolge ihrer Wichtigkeit " +"aufzulisten, die bevorzugte Quelle zuerst. Typischerweise resultiert dies in " +"einer Sortierung nach Geschwindigkeit, vom schnellsten zum langsamsten (CD-" +"ROM, gefolgt von Rechnern im lokalen Netzwerk, gefolgt von Internet-" +"Rechnern, zum Beispiel)." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:112 +msgid "Some examples:" +msgstr "Einige Beispiele:" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:114 +#, no-wrap +msgid "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " +msgstr "" +"deb http://http.us.debian.org/debian stable main contrib non-free\n" +"deb http://http.us.debian.org/debian dists/stable-updates/\n" +" " + +#. type: Content of: <refentry><refsect1><title> +#: sources.list.5.xml:120 +msgid "URI specification" +msgstr "URI-Beschreibung" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:125 +msgid "file" +msgstr "file" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:127 +msgid "" +"The file scheme allows an arbitrary directory in the file system to be " +"considered an archive. This is useful for NFS mounts and local mirrors or " +"archives." +msgstr "" +"Das file-Schema erlaubt es einem beliebigen Verzeichnis im Dateisystem, als " +"Archiv betrachtet zu werden. Dies ist n??tzlich f??r eingeh??ngtes NFS und " +"lokale Spiegel oder Archive." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:134 +msgid "" +"The cdrom scheme allows APT to use a local CDROM drive with media swapping. " +"Use the &apt-cdrom; program to create cdrom entries in the source list." +msgstr "" +"Das cdrom-Schema erlaubt APT ein lokales CD-ROM-Laufwerk mit Medienwechsel " +"zu benutzen. Benutzen Sie das Programm &apt-cdrom;, um CD-ROM-Eintr??ge in " +"der Quellenliste zu erstellen." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:141 +msgid "" +"The http scheme specifies an HTTP server for the archive. If an environment " +"variable <envar>http_proxy</envar> is set with the format http://server:" +"port/, the proxy server specified in <envar>http_proxy</envar> will be used. " +"Users of authenticated HTTP/1.1 proxies may use a string of the format " +"http://user:pass@server:port/ Note that this is an insecure method of " +"authentication." +msgstr "" +"Das http-Schema gibt einen HTTP-Server f??r das Archiv an. Wenn eine " +"Umgebungsvariable <envar>http_proxy</envar> mit dem Format http://Server:" +"Port/ gesetzt ist, wird der in <envar>http_proxy</envar> angegebene Proxy-" +"Server benutzt. Anwender eines HTTP/1.1-authentifizierten Proxys k??nnen " +"eine Zeichenkette mit dem Format http://Anwender:Passwort@Server:Port/ " +"benutzt. Beachten Sie, dass dies eine unsichere Authentifizierungsmethode " +"ist." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:152 +msgid "" +"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " +"is highly configurable; for more information see the &apt-conf; manual page. " +"Please note that a ftp proxy can be specified by using the <envar>ftp_proxy</" +"envar> environment variable. It is possible to specify a http proxy (http " +"proxy servers often understand ftp urls) using this method and ONLY this " +"method. ftp proxies using http specified in the configuration file will be " +"ignored." +msgstr "" +"Das ftp-Schema gibt einen FTP-Server f??r das Archiv an. Das FTP-Verhalten " +"von APT ist in hohem Ma??e konfigurierbar. Um weitere Informationen zu " +"erhalten, lesen Sie die &apt-conf;-Handbuchseite. Bitte beachten Sie, dass " +"ein FTP-Proxy durch Benutzung der <envar>ftp_proxy</envar>-" +"Umgebungsvariablen angegeben werden kann. Es ist mit dieser Methode und NUR " +"dieser Methode m??glich, einen HTTP-Proxy anzugeben (HTTP-Proxy-Server " +"verstehen oft auch FTP-URLs). FTP-Proxys, die gem???? Angabe in der " +"Konfigurationsdatei HTTP benutzen, werden ignoriert." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:161 +msgid "copy" +msgstr "copy" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:163 +msgid "" +"The copy scheme is identical to the file scheme except that packages are " +"copied into the cache directory instead of used directly at their location. " +"This is useful for people using a zip disk to copy files around with APT." +msgstr "" +"Das copy-Schema ist identisch mit dem file-Schema, au??er dass Pakete in das " +"Zwischenspeicherverzeichnis kopiert werden, anstatt direkt von ihrem " +"Herkunftsort benutzt zu werden. Dies ist f??r Leute n??tzlich, die eine ZIP-" +"Platte benutzen, um Dateien mit APT umherzukopieren." + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:168 +msgid "rsh" +msgstr "rsh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: sources.list.5.xml:168 +msgid "ssh" +msgstr "ssh" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: sources.list.5.xml:170 +msgid "" +"The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " +"user and access the files. It is a good idea to do prior arrangements with " +"RSA keys or rhosts. Access to files on the remote uses standard " +"<command>find</command> and <command>dd</command> commands to perform the " +"file transfers from the remote." +msgstr "" +"Die rsh/ssh-Methode ruft rsh/ssh auf, um sich als angegebener Benutzer mit " +"einem Rechner in der Ferne zu verbinden und auf die Dateien zuzugreifen. Es " +"ist eine gute Idee, vorher Vorbereitungen mit RSA-Schl??sseln oder rhosts zu " +"treffen. Der Zugriff auf Dateien in der Ferne benutzt die Standardbefehle " +"<command>find</command> und <command>dd</command>, um die Daten??bertragung " +"aus der Ferne durchzuf??hren." + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:122 +msgid "" +"The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " +"rsh. <placeholder type=\"variablelist\" id=\"0\"/>" +msgstr "" +"Die aktuell erkannten URI-Typen sind cdrom, file, http, ftp, copy, ssh, rsh. " +"<placeholder type=\"variablelist\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:182 +msgid "" +"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " +"stable/main, stable/contrib, and stable/non-free." +msgstr "" +"Benutzt die lokal gespeicherten (oder per NFS eingeh??ngten) Archive in /" +"home/jason/debian f??r stable/main, stable/contrib und stable/non-free." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:184 +#, no-wrap +msgid "deb file:/home/jason/debian stable main contrib non-free" +msgstr "deb file:/home/jason/debian stable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:186 +msgid "As above, except this uses the unstable (development) distribution." +msgstr "" +"Wie oben, au??er das dies die unstable- (Entwicklungs-) Distribution benutzt." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:187 +#, no-wrap +msgid "deb file:/home/jason/debian unstable main contrib non-free" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:189 +msgid "Source line for the above" +msgstr "Quellzeile f??r obiges" + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:190 +#, no-wrap +msgid "deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:192 +msgid "" +"Uses HTTP to access the archive at archive.debian.org, and uses only the " +"hamm/main area." +msgstr "" +"Benutzt HTTP, um auf das Archiv auf archive.debian.org zuzugreifen und nur " +"den hamm/main-Bereich zu benutzen." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:194 +#, no-wrap +msgid "deb http://archive.debian.org/debian-archive hamm main" +msgstr "deb http://archive.debian.org/debian-archive hamm main" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:196 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the stable/contrib area." +msgstr "" +"Benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-" +"Verzeichnis zuzugreifen und nur den stable/contrib-Bereich zu benutzen." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:198 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:200 +msgid "" +"Uses FTP to access the archive at ftp.debian.org, under the debian " +"directory, and uses only the unstable/contrib area. If this line appears as " +"well as the one in the previous example in <filename>sources.list</" +"filename>. a single FTP session will be used for both resource lines." +msgstr "" +"Benutzt FTP, um auf das Archiv auf ftp.debian.org unter dem debian-" +"Verzeichnis zuzugreifen und nur den unstable/contrib-Bereich zu benutzen. " +"Falls diese Zeile zusammen mit der aus dem vorherigen Beispiel in der Datei " +"<filename>sources.list</filename> auftaucht, wird eine einzelne FTP-Sitzung " +"f??r beide Quellzeilen benutzt." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:204 +#, no-wrap +msgid "deb ftp://ftp.debian.org/debian unstable contrib" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:206 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory." +msgstr "" +"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-" +"Verzeichnis zuzugreifen." + +#. type: Content of: <refentry><refsect1><literallayout> +#: sources.list.5.xml:208 +#, no-wrap +msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" + +#. type: Content of: <refentry><refsect1><para><literallayout> +#: sources.list.5.xml:217 +#, no-wrap +msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:210 +msgid "" +"Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " +"directory, and uses only files found under <filename>unstable/binary-i386</" +"filename> on i386 machines, <filename>unstable/binary-m68k</filename> on " +"m68k, and so forth for other supported architectures. [Note this example " +"only illustrates how to use the substitution variable; non-us is no longer " +"structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" +msgstr "" +"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-" +"Verzeichnis zuzugreifen und benutzt nur Dateien, die unter " +"<filename>unstable/binary-i386</filename> auf i386-Maschinen, " +"<filename>unstable/binary-m68k</filename> auf m68k und so weiter f??r andere " +"unterst??tzte Architekturen, gefunden werden. [Beachten Sie, dass dieses " +"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. " +"non-us ist nicht l??nger so strukturiert] <placeholder type=\"literallayout" +"\" id=\"0\"/>" + +#. type: Content of: <refentry><refsect1><para> +#: sources.list.5.xml:222 +msgid "&apt-cache; &apt-conf;" +msgstr "&apt-cache; &apt-conf;" -- cgit v1.2.3-70-g09d2 From f6ffd37506c2a69457d1f21b30a5f476c2de70cd Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Wed, 28 Oct 2009 23:44:26 +0100 Subject: remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead --- buildlib/config.guess | 1526 -------------------------------------------- buildlib/config.sub | 1658 ------------------------------------------------ buildlib/configure.mak | 4 + debian/changelog | 3 + debian/control | 2 +- 5 files changed, 8 insertions(+), 3185 deletions(-) delete mode 100755 buildlib/config.guess delete mode 100755 buildlib/config.sub (limited to 'debian') diff --git a/buildlib/config.guess b/buildlib/config.guess deleted file mode 100755 index f32079abd..000000000 --- a/buildlib/config.guess +++ /dev/null @@ -1,1526 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2008-01-23' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner <per@bothner.com>. -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <config-patches@gnu.org>." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include <stdio.h> /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <sys/systemcfg.h> - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <unistd.h> - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL - elif /bin/uname -X 2>/dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <hewes@openmarket.com>. - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 <<EOF -$0: unable to guess system type - -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from - - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <config-patches@gnu.org> in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/buildlib/config.sub b/buildlib/config.sub deleted file mode 100755 index 6759825a5..000000000 --- a/buildlib/config.sub +++ /dev/null @@ -1,1658 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2008-01-16' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <config-patches@gnu.org>." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 957568789..d3c548ee3 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -16,6 +16,10 @@ BUILDDIR=build startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) configure: aclocal.m4 configure.in + # use the files provided from the system instead of carry around + # and use (most of the time outdated) copycats + ln -sf /usr/share/misc/config.sub buildlib/config.sub + ln -sf /usr/share/misc/config.guess buildlib/config.guess autoconf aclocal.m4: $(wildcard buildlib/*.m4) diff --git a/debian/changelog b/debian/changelog index e7a7e1c49..55e191222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ apt (0.7.25) UNRELEASED; urgency=low - only warn if (free) space overflows (Closes: #522238) * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + * buildlib/configure.mak, buildlib/config.{sub,guess}: + - remove (outdated) config.{sub,guess} and use the ones provided + by the new added build-dependency autotools-dev instead [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h diff --git a/debian/control b/debian/control index 7eae1860c..5db294f2e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.8.2.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2) +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt -- cgit v1.2.3-70-g09d2 From 5f4331c4d265aa83229e3e58edd49e54731fb646 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Thu, 29 Oct 2009 00:14:21 +0100 Subject: correct various errors, typos and oddities in the manpages Patch by Chris Leick which closes his on bug. Thanks! * doc/ various manpages: - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: - replace literal with emphasis tags in Archive configuration --- debian/changelog | 6 ++++++ doc/apt-cache.8.xml | 2 +- doc/apt-extracttemplates.1.xml | 2 +- doc/apt-ftparchive.1.xml | 2 +- doc/apt-get.8.xml | 4 ++-- doc/apt-secure.8.xml | 12 ++++++------ doc/apt.conf.5.xml | 18 +++++++++--------- doc/sources.list.5.xml | 14 +++++++------- 8 files changed, 33 insertions(+), 27 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 55e191222..88ac07ba2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,12 @@ apt (0.7.25) UNRELEASED; urgency=low - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead + [ Chris Leick ] + * doc/ various manpages: + - correct various errors, typos and oddities (Closes: #552535) + * doc/apt-secure.8.xml: + - replace literal with emphasis tags in Archive configuration + [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2. diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index c61d00e47..538de3c27 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -151,7 +151,7 @@ Reverse Provides: <listitem><para><literal>Missing</literal> is the number of package names that were referenced in a dependency but were not provided by any package. Missing packages may - be in evidence if a full distribution is not accessed, or if a package + be an evidence if a full distribution is not accessed, or if a package (real or virtual) has been dropped from the distribution. Usually they are referenced from Conflicts or Breaks statements.</para> </listitem> diff --git a/doc/apt-extracttemplates.1.xml b/doc/apt-extracttemplates.1.xml index 77b837022..9f8a4056d 100644 --- a/doc/apt-extracttemplates.1.xml +++ b/doc/apt-extracttemplates.1.xml @@ -60,7 +60,7 @@ <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term> <listitem><para> Temporary directory in which to write extracted debconf template files - and config scripts + and config scripts. Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem> </varlistentry> diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 334cc85da..d4d77c68e 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -158,7 +158,7 @@ <para> The <literal>Dir</literal> section defines the standard directories needed to locate the files required during the generation process. These - directories are prepended to certain relative paths defined in later + directories are prepended certain relative paths defined in later sections to produce a complete an absolute path.</para> <variablelist> <varlistentry><term>ArchiveDir</term> diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 4735dcd34..d3c3772bd 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -263,7 +263,7 @@ you will properly get another (newer, older or none) source version than the one you have installed or could install.</para> - <para>If the <option>--compile</option> options is specified + <para>If the <option>--compile</option> option is specified then the package will be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if <option>--download-only</option> is specified then the source package will not be unpacked.</para> @@ -391,7 +391,7 @@ <para>Simulate prints out a series of lines each one representing a dpkg operation, Configure (Conf), - Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with + Remove (Remv), Unpack (Inst). Square brackets indicate broken packages and empty set of square brackets meaning breaks that are of no consequence (rare).</para></listitem> </varlistentry> diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml index 20f473f77..908fc342f 100644 --- a/doc/apt-secure.8.xml +++ b/doc/apt-secure.8.xml @@ -68,7 +68,7 @@ different steps. <command>apt-secure</command> is the last step in this chain, trusting an archive does not mean that the packages that you trust it do not contain malicious code but means that you - trust the archive maintainer. Its the archive maintainer + trust the archive maintainer. It's the archive maintainer responsibility to ensure that the archive integrity is correct. </para> @@ -94,7 +94,7 @@ is computed and put in the Packages file. The MD5 sum of all of the packages files are then computed and put into the Release file. The Release file is then signed by the archive key (which is created - once a year and distributed through the FTP server. This key is + once a year) and distributed through the FTP server. This key is also on the Debian keyring. </para> @@ -157,15 +157,15 @@ </para> <itemizedlist> - <listitem><para><literal>Create a toplevel Release - file</literal>. if it does not exist already. You can do this + <listitem><para><emphasis>Create a toplevel Release + file</emphasis>, if it does not exist already. You can do this by running <command>apt-ftparchive release</command> (provided in apt-utils).</para></listitem> - <listitem><para><literal>Sign it</literal>. You can do this by running + <listitem><para><emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -o Release.gpg Release</command>.</para></listitem> - <listitem><para><literal>Publish the key fingerprint</literal>, + <listitem><para><emphasis>Publish the key fingerprint</emphasis>, that way your users will know what key they need to import in order to authenticate the files in the archive.</para></listitem> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 6ee719987..e2db9defb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -48,9 +48,9 @@ loading even more config files.</para> <para>The configuration file is organized in a tree with options organized into - functional groups. option specification is given with a double colon + functional groups. Option specification is given with a double colon notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within - the APT tool group, for the Get tool. options do not inherit from their + the APT tool group, for the Get tool. Options do not inherit from their parent groups.</para> <para>Syntactically the configuration language is modeled after what the ISC tools @@ -58,7 +58,7 @@ <literal>//</literal> are treated as comments (ignored), as well as all text between <literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments. Each line is of the form - <literal>APT::Get::Assume-Yes "true";</literal> The trailing + <literal>APT::Get::Assume-Yes "true";</literal>. The trailing semicolon and the quotes are required. The value must be on one line, and there is no kind of string concatenation. It must not include inside quotes. The behavior of the backslash "\" and escaped characters inside a value is @@ -265,7 +265,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; 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) + 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 @@ -536,9 +536,9 @@ DPkg::TriggersPending "true";</literallayout></para> <variablelist> <varlistentry><term>DPkg::NoTriggers</term> - <listitem><para>Add the no triggers flag to all dpkg calls (expect the ConfigurePending call). + <listitem><para>Add the no triggers flag to all dpkg calls (except the ConfigurePending call). See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the - triggers then this flag is present unless it is explicit called to do so in an extra call. + triggers when this flag is present unless it is explicitly called to do so in an extra call. Note that this option exists (undocumented) also in older apt versions with a slightly different meaning: Previously these option only append --no-triggers to the configure calls to dpkg - now apt will add these flag also to the unpack and remove calls.</para></listitem> @@ -549,8 +549,8 @@ DPkg::TriggersPending "true";</literallayout></para> The "<literal>smart</literal>" way is it to configure only packages which need to be configured before another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated by the next option. "<literal>no</literal>" on the other hand will not configure anything and totally - relay on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered). - Setting this option to another than the all value will implicit activate also the next option per + rely on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered). + Setting this option to another than the all value will implicitly activate also the next option per default as otherwise the system could end in an unconfigured status which could be unbootable! </para></listitem> </varlistentry> @@ -558,7 +558,7 @@ DPkg::TriggersPending "true";</literallayout></para> <listitem><para>If this option is set apt will call <command>dpkg --configure --pending</command> to let dpkg handle all required configurations and triggers. This option is activated automatic per default if the previous option is not set to <literal>all</literal>, but deactivating could be useful - if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you could + 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.</para></listitem> </varlistentry> <varlistentry><term>DPkg::TriggersPending</term> diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 379112c83..0f788aca1 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -34,13 +34,13 @@ <para>The package resource list is used to locate archives of the package distribution system in use on the system. At this time, this manual page documents only the packaging system used by the Debian GNU/Linux system. - This control file is located in <filename>/etc/apt/sources.list</filename></para> + This control file is <filename>/etc/apt/sources.list</filename>.</para> <para>The source list is designed to support any number of active sources and a variety of source media. The file lists one source per line, with the most preferred source listed first. The format of each line is: <literal>type uri args</literal> The first item, <literal>type</literal> - determines the format for <literal>args</literal> <literal>uri</literal> is + determines the format for <literal>args</literal>. <literal>uri</literal> is a Universal Resource Identifier (URI), which is a superset of the more specific and well-known Universal Resource Locator, or URL. The rest of the line can be marked as a comment @@ -64,14 +64,14 @@ <literal>stable</literal> <literal>unstable</literal> or <literal>testing</literal> while component is one of <literal>main</literal> <literal>contrib</literal> <literal>non-free</literal> or - <literal>non-us</literal> The + <literal>non-us</literal>. The <literal>deb-src</literal> type describes a debian distribution's source code in the same form as the <literal>deb</literal> type. A <literal>deb-src</literal> line is required to fetch source indexes.</para> <para>The format for a <filename>sources.list</filename> entry using the - <literal>deb</literal> and <literal>deb-src</literal> types are:</para> + <literal>deb</literal> and <literal>deb-src</literal> types is:</para> <literallayout>deb uri distribution [component1] [component2] [...]</literallayout> @@ -79,7 +79,7 @@ Debian distribution, from which APT will find the information it needs. <literal>distribution</literal> can specify an exact path, in which case the components must be omitted and <literal>distribution</literal> must end with - a slash (/). This is useful for when only a particular sub-section of the + a slash (/). This is useful for when the case only a particular sub-section of the archive denoted by the URI is of interest. If <literal>distribution</literal> does not specify an exact path, at least one <literal>component</literal> must be present.</para> @@ -143,7 +143,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ http://server:port/, the proxy server specified in <envar>http_proxy</envar> will be used. Users of authenticated HTTP/1.1 proxies may use a string of the format - http://user:pass@server:port/ + http://user:pass@server:port/. Note that this is an insecure method of authentication.</para></listitem> </varlistentry> @@ -211,7 +211,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/ <para>Uses FTP to access the archive at ftp.debian.org, under the debian directory, and uses only the unstable/contrib area. If this line appears as - well as the one in the previous example in <filename>sources.list</filename>. + well as the one in the previous example in <filename>sources.list</filename> a single FTP session will be used for both resource lines.</para> <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout> -- cgit v1.2.3-70-g09d2 From a1e42d1fd8848cdcb853811b6974d77c66124d4b Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 29 Oct 2009 11:53:01 +0100 Subject: * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: - typo fix (LP: #462328) --- apt-pkg/depcache.cc | 2 +- apt-pkg/indexcopy.cc | 6 +++--- debian/changelog | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 13abbe5ed..45e427d81 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -243,7 +243,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ continue; bool newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); if(_config->FindB("Debug::pkgAutoRemove",false)) - std::clog << "Update exisiting AutoInstall info: " + std::clog << "Update existing AutoInstall info: " << pkg.Name() << std::endl; TFRewriteData rewrite[2]; rewrite[0].Tag = "Auto-Installed"; diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 15696585a..e7bf046a4 100644 --- a/apt-pkg/indexcopy.cc +++ b/apt-pkg/indexcopy.cc @@ -527,19 +527,19 @@ bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex) // (non-existing files are not considered a error) if(!FileExists(prefix+file)) { - _error->Warning("Skipping non-exisiting file %s", string(prefix+file).c_str()); + _error->Warning(_("Skipping nonexistent file %s"), string(prefix+file).c_str()); return true; } if (!Record) { - _error->Warning("Can't find authentication record for: %s",file.c_str()); + _error->Warning(_("Can't find authentication record for: %s"), file.c_str()); return false; } if (!Record->Hash.VerifyFile(prefix+file)) { - _error->Warning("Hash mismatch for: %s",file.c_str()); + _error->Warning(_("Hash mismatch for: %s"),file.c_str()); return false; } diff --git a/debian/changelog b/debian/changelog index 618e855ee..15b6eb106 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,10 @@ apt (0.7.22.4) unstable; urgency=low - add output about pre-depends configuring when debug::pkgPackageManager is used + [ Brian Murray ] + * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: + - typo fix (LP: #462328) + [ Loïc Minier ] * cmdline/apt-key: - Emit a warning if removed keys keyring is missing and skip associated -- cgit v1.2.3-70-g09d2 From e46a23a59689c917ad3e589a84add9fdfa498159 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 2 Nov 2009 17:54:22 +0100 Subject: remove traces of old manpage-buildsystems --- buildlib/defaults.mak | 3 --- buildlib/environment.mak.in | 8 +------- buildlib/xml_manpage.mak | 45 --------------------------------------------- buildlib/yodl_manpage.mak | 42 ------------------------------------------ configure.in | 9 --------- debian/changelog | 7 +++++++ debian/control | 2 +- doc/makefile | 36 ++++++++++++++++++++++++++++-------- 8 files changed, 37 insertions(+), 115 deletions(-) delete mode 100644 buildlib/xml_manpage.mak delete mode 100644 buildlib/yodl_manpage.mak (limited to 'debian') diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 5373ee5cf..bf93bd2ee 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -81,10 +81,7 @@ MANPAGE_H = $(BASE)/buildlib/manpage.mak PROGRAM_H = $(BASE)/buildlib/program.mak PYTHON_H = $(BASE)/buildlib/python.mak COPY_H = $(BASE)/buildlib/copy.mak -YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak -SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak PO4A_MANPAGE_H = $(BASE)/buildlib/po4a_manpage.mak -XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak FAIL_H = $(BASE)/buildlib/fail.mak PODOMAIN_H = $(BASE)/buildlib/podomain.mak diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index b3afca0ad..5fca48d5a 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -30,13 +30,7 @@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@ DOXYGEN = @DOXYGEN@ -# SGML for the man pages -DOCBOOK2MAN := @DOCBOOK2MAN@ - -# XML for the man pages -XMLTO := @XMLTO@ - -# po4a for the man pages +# xsltproc for the man pages XSLTPROC := @XSLTPROC@ # po4a for the man pages diff --git a/buildlib/xml_manpage.mak b/buildlib/xml_manpage.mak deleted file mode 100644 index c8b155d09..000000000 --- a/buildlib/xml_manpage.mak +++ /dev/null @@ -1,45 +0,0 @@ -# -*- make -*- - -# This handles man pages in DocBook XML format. We convert to the respective -# output in the source directory then copy over to the final dest. This -# means xmlto is only needed if compiling from Arch - -# Input -# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 -# the XML files are called apt-cache.8.xml - -# See defaults.mak for information about LOCAL - -# Some local definitions -ifdef XMLTO - -LOCAL := xml-manpage-$(firstword $(SOURCE)) -$(LOCAL)-LIST := $(SOURCE) - -# Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) - -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) - echo Creating man page $@ - $(XMLTO) man $< - -# Clean rule -.PHONY: veryclean/$(LOCAL) -veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) - -HAVE_XMLTO=yes -endif - -INCLUDES := - -ifndef HAVE_XMLTO -# Strip from the source list any man pages we dont have compiled already -SOURCE := $(wildcard $(SOURCE)) -endif - -# Chain to the manpage rule -ifneq ($(words $(SOURCE)),0) -include $(MANPAGE_H) -endif diff --git a/buildlib/yodl_manpage.mak b/buildlib/yodl_manpage.mak deleted file mode 100644 index a5f436f60..000000000 --- a/buildlib/yodl_manpage.mak +++ /dev/null @@ -1,42 +0,0 @@ -# -*- make -*- - -# This handles man pages in YODL format. We convert to the respective -# output in the source directory then copy over to the final dest. This -# means yodl is only needed if compiling from CVS - -# Input -# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8 -# the yodl files are called apt-cache.8.yo - -# See defaults.mak for information about LOCAL - -# Some local definitions -ifdef YODL_MAN - -LOCAL := yodl-manpage-$(firstword $(SOURCE)) -$(LOCAL)-LIST := $(SOURCE) - -# Install generation hooks -doc: $($(LOCAL)-LIST) -veryclean: veryclean/$(LOCAL) - -$($(LOCAL)-LIST) :: % : %.yo - echo Creating man page $@ - yodl2man -o $@ $< - -# Clean rule -.PHONY: veryclean/$(LOCAL) -veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) - -else - -# Strip from the source list any man pages we dont have compiled already -SOURCE := $(wildcard $(SOURCE)) - -endif - -# Chain to the manpage rule -ifneq ($(words $(SOURCE)),0) -include $(MANPAGE_H) -endif diff --git a/configure.in b/configure.in index 9d6589e55..9bcb94068 100644 --- a/configure.in +++ b/configure.in @@ -184,12 +184,6 @@ AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) dnl Check for doxygen AC_PATH_PROG(DOXYGEN, doxygen) -dnl Check for the SGML tools needed to build man pages -AC_PATH_PROG(DOCBOOK2MAN,docbook2man) - -dnl Check for the XML tools needed to build man pages -AC_PATH_PROG(XMLTO,xmlto) - dnl Check for the XSLTProc tool needed to build man pages together with po4a AC_PATH_PROG(XSLTPROC,xsltproc) @@ -202,9 +196,6 @@ AC_PATH_PROG([DOT], [dot], []) DOTDIR=$(dirname $DOT) AC_SUBST(DOTDIR) -dnl Check for YODL -dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") - ah_NUM_PROCS rc_GLIBC_VER rc_LIBSTDCPP_VER diff --git a/debian/changelog b/debian/changelog index 9c4d46e09..8db5fa3d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,13 @@ apt (0.7.25) UNRELEASED; urgency=low * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead + * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak: + - remove the now obsolete manpage buildsystems + * doc/{pl,pt_BR,es,it}/*.{sgml,xml}: + - convert all remaining translation to the po4a system + * debian/control: + - drop build-dependency on docbook-utils and xmlto + - add build-dependency on autotools-dev [ Chris Leick ] * doc/ various manpages: diff --git a/debian/control b/debian/control index 5db294f2e..18bcff3d4 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.8.2.0 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2), autotools-dev +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt diff --git a/doc/makefile b/doc/makefile index fe53aba48..6fb604e4e 100644 --- a/doc/makefile +++ b/doc/makefile @@ -11,13 +11,34 @@ SOURCE = $(wildcard *.sgml) DEBIANDOC_HTML_OPTIONS=-l en include $(DEBIANDOC_H) -# XML man pages -SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \ - apt-config.8 apt_preferences.5 \ - apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \ - apt-key.8 apt-secure.8 apt-mark.8 -INCLUDES = apt.ent -include $(XML_MANPAGE_H) +# Do not use XMLTO, build the manpages directly with XSLTPROC +ifdef XSLTPROC +# generate a list of accepted man page translations +SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml)) +INCLUDES = apt.ent +STYLESHEET=manpage-style.xsl + +LOCAL := manpage-$(firstword $(SOURCE)) +$(LOCAL)-LIST := $(SOURCE) + +# Install generation hooks +doc: $($(LOCAL)-LIST) +veryclean: veryclean/$(LOCAL) + +$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) + echo Creating man page $@ + $(XSLTPROC) -o $@ $(STYLESHEET) $< + +# Clean rule +.PHONY: veryclean/$(LOCAL) +veryclean/$(LOCAL): + -rm -rf $($(@F)-LIST) + +endif + +# Chain to the manpage rule +SOURCE = apt.8 +include $(MANPAGE_H) # Examples SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf @@ -78,5 +99,4 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile touch $(BUILD)/doc/doxygen-stamp doc: $(BUILD)/doc/doxygen-stamp - endif -- cgit v1.2.3-70-g09d2 From fd0339078d81dfb57978e59ef420bb8ae4bb39b1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 2 Nov 2009 18:44:37 +0100 Subject: bump policy to 3.8.3 as we have no outdated manpages anymore --- debian/changelog | 1 + debian/control | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8db5fa3d6..4b3fae9bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/control: - drop build-dependency on docbook-utils and xmlto - add build-dependency on autotools-dev + - bump policy to 3.8.3 as we have no outdated manpages anymore [ Chris Leick ] * doc/ various manpages: diff --git a/debian/control b/debian/control index 18bcff3d4..357fb3f5f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> -Standards-Version: 3.8.2.0 +Standards-Version: 3.8.3 Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ @@ -67,7 +67,6 @@ Package: apt-transport-https Architecture: any Depends: ${shlibs:Depends} Priority: optional -Section: admin Description: APT https transport This package contains a APT https transport. It makes it possible to use 'deb https://foo distro main' lines in the sources.list. -- cgit v1.2.3-70-g09d2 From 338bf6c2f9e98f7eeaf7060c7afc392f9816d928 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 11 Nov 2009 19:44:38 +0100 Subject: Italian translation update --- debian/changelog | 2 ++ po/it.po | 64 +++++++++++++++++++++++++++++++++----------------------- 2 files changed, 40 insertions(+), 26 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d9109ca4..28f24f396 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #551534 * German translation of manpages by Chris Leick Closes: #552606 + * Italian translation update by Milo Casagrande + Closes: #555797 [ Michael Vogt ] * apt-pkg/packagemanager.cc: diff --git a/po/it.po b/po/it.po index 0673df460..4979e02b9 100644 --- a/po/it.po +++ b/po/it.po @@ -2,14 +2,14 @@ # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc. # This file is distributed under the same license as the apt package. # Samuele Giovanni Tonon <samu@debian.org>, 2002. -# Milo Casagrande <milo@ubuntu.com>, 2009 # +# Milo Casagrande <milo@ubuntu.com>, 2009. msgid "" msgstr "" -"Project-Id-Version: apt 0.7.20\n" +"Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-27 17:32+0200\n" -"PO-Revision-Date: 2009-06-04 13:23+0200\n" +"PO-Revision-Date: 2009-11-11 19:29+0100\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "MIME-Version: 1.0\n" @@ -237,6 +237,7 @@ msgstr "" #: cmdline/apt-cdrom.cc:77 #, fuzzy +#| msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "Dare un nome a questo disco, tipo \"Debian 5.0 Disco 1\"" @@ -1031,11 +1032,11 @@ msgstr "" "richiesti:" #: cmdline/apt-get.cc:1505 -#, fuzzy, c-format +#, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -"I seguenti pacchetti sono stati installati automaticamente e non sono più " -"richiesti:" +"%lu pacchetti sono stati installati automaticamente e non sono più " +"richiesti.\n" #: cmdline/apt-get.cc:1506 msgid "Use 'apt-get autoremove' to remove them." @@ -1271,7 +1272,6 @@ msgid "Supported modules:" msgstr "Moduli supportati:" #: cmdline/apt-get.cc:2697 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1364,6 +1364,10 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" +"Nota: questa è solo una simulazione.\n" +" apt-get necessita dei privilegi di root per la normale esecuzione.\n" +" Inoltre, il meccanismo di blocco non è attivato e non è quindi\n" +" utile dare importanza a tutto ciò per una situazione reale." #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1449,6 +1453,7 @@ msgstr "Eliminare tutti i file .deb precedentemente scaricati?" # at only 80 characters per line, if possible. #: dselect/install:101 #, fuzzy +#| msgid "Some errors occurred while unpacking. I'm going to configure the" msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" "Si sono verificati alcuni errori nell'estrazione. Verrà tentato di " @@ -1456,6 +1461,7 @@ msgstr "" #: dselect/install:102 #, fuzzy +#| msgid "packages that were installed. This may result in duplicate errors" msgid "will be configured. This may result in duplicate errors" msgstr "" "i pacchetti che sono stati installati. Questo potrebbe generare molteplici " @@ -1507,6 +1513,7 @@ msgstr "Errore nel leggere l'intestazione member dell'archivio" #: apt-inst/contrib/arfile.cc:90 #, fuzzy, c-format +#| msgid "Invalid archive member header" msgid "Invalid archive member header %s" msgstr "Intestazione member dell'archivio non valida" @@ -1999,6 +2006,7 @@ msgstr "" #: methods/connect.cc:240 #, fuzzy, c-format +#| msgid "Unable to connect to %s %s:" msgid "Unable to connect to %s:%s:" msgstr "Impossibile connettersi a %s %s:" @@ -2335,9 +2343,9 @@ msgid "Sub-process %s received a segmentation fault." msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." #: apt-pkg/contrib/fileutl.cc:458 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "Il sottoprocesso %s ha ricevuto un segmentation fault." +msgstr "Il sottoprocesso %s ha ricevuto il segnale %u." #: apt-pkg/contrib/fileutl.cc:462 #, c-format @@ -2432,7 +2440,7 @@ msgstr "Rompe" #: apt-pkg/pkgcache.cc:227 msgid "Enhances" -msgstr "" +msgstr "Migliora" #: apt-pkg/pkgcache.cc:238 msgid "important" @@ -2653,9 +2661,11 @@ msgstr "" "È consigliato eseguire \"apt-get update\" per correggere questi problemi" #: apt-pkg/policy.cc:347 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Campo non valido nel file delle preferenze: manca l'header \"Package\"" +msgstr "" +"Campo non valido nel file delle preferenze %s, manca l'intestazione \"Package" +"\"" #: apt-pkg/policy.cc:369 #, c-format @@ -2813,19 +2823,19 @@ msgid "Size mismatch" msgstr "Le dimensioni non corrispondono" #: apt-pkg/indexrecords.cc:40 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "Impossibile analizzare il file di pacchetto %s (1)" +msgstr "Impossibile analizzare il file Release %s" #: apt-pkg/indexrecords.cc:47 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "Nota, viene selezionato %s al posto di %s\n" +msgstr "Nessuna sezione nel file Release %s" #: apt-pkg/indexrecords.cc:81 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "Nessuna voce Hash nel file Release %s" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2890,6 +2900,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"Impossibile trovare alcun file di pacchetto. Questo potrebbe non essere un " +"disco Debian o potrebbe essere l'architettura errata." #: apt-pkg/cdrom.cc:710 #, c-format @@ -3015,7 +3027,7 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:907 msgid "Running dpkg" -msgstr "" +msgstr "Esecuzione di dpkg" #: apt-pkg/deb/debsystem.cc:70 #, c-format @@ -3023,17 +3035,23 @@ msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" +"Impossibile acquisire il blocco sulla directory di amministrazione (%s). Un " +"altro processo potrebbe tenerla occupata." #: apt-pkg/deb/debsystem.cc:73 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Impossibile bloccare la directory" +msgstr "" +"Impossibile acquisire il blocco sulla directory di amministrazione (%s). È " +"necessario essere root." #: apt-pkg/deb/debsystem.cc:82 msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " msgstr "" +"dpkg è stato interrotto. È necessario eseguire \"dpkg --configure -a\" per " +"correggere il problema. " #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" @@ -3046,9 +3064,3 @@ msgstr "Impossibile applicare la patch al file" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connessione chiusa prematuramente" - -#~ msgid "%4i %s\n" -#~ msgstr "%4i %s\n" - -#~ msgid "Processing triggers for %s" -#~ msgstr "Elaborazione opzioni addizionali per %s" -- cgit v1.2.3-70-g09d2 From 43cf55db7c2ce7015d365556ed9ab0b8b2cec3ca Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 17 Nov 2009 09:51:31 -0600 Subject: * methods/https.cc: - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 thanks to Brian Thomason for the patch --- debian/changelog | 3 +++ methods/https.cc | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 15b6eb106..417cd2436 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.22.4) unstable; urgency=low * apt-pkg/packagemanager.cc: - add output about pre-depends configuring when debug::pkgPackageManager is used + * methods/https.cc: + - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 + thanks to Brian Thomason for the patch [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: diff --git a/methods/https.cc b/methods/https.cc index 37d93e308..3cbb0088a 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -212,8 +212,11 @@ bool HttpsMethod::Fetch(FetchItem *Itm) // set timeout int timeout = _config->FindI("Acquire::http::Timeout",120); - curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); + //set really low lowspeed timeout (see #497983) + int dlMin = 1; + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, dlMin); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout); // set redirect options and default to 10 redirects bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true); -- cgit v1.2.3-70-g09d2 From 49012e99a80a08925e4ad9911308c1c1b5cb33fb Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Tue, 24 Nov 2009 12:26:07 +0100 Subject: fix a typo in debian/NEWS entry for 0.7.24: Allready -> Already (Closes: #557674) --- debian/NEWS | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 1df94144d..7612adb9c 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,6 +1,6 @@ apt (0.7.24) unstable; urgency=low - * Allready included in the last version but now with better documentation + * Already included in the last version but now with better documentation is the possibility to add/prefer different compression types while downloading archive informations, which can decrease the time needed for update on slow machines. See apt.conf (5) manpage for details. diff --git a/debian/changelog b/debian/changelog index 4b3fae9bb..4718015a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,8 @@ apt (0.7.25) UNRELEASED; urgency=low - drop build-dependency on docbook-utils and xmlto - add build-dependency on autotools-dev - bump policy to 3.8.3 as we have no outdated manpages anymore + * debian/NEWS: + - fix a typo in 0.7.24: Allready -> Already (Closes: #557674) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 1692a2c79f4c423ff257a882a1e8e16c3edad882 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Tue, 24 Nov 2009 15:22:51 +0100 Subject: * ftparchive/apt-ftparchive.cc: - Call setlocale() so translations are actually used. --- debian/changelog | 2 ++ ftparchive/apt-ftparchive.cc | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 28f24f396..3f70b440d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/https.cc: - Add support for authentication using netrc (Closes: #518473), patch by Jussi Hakala <jussi.hakala@hut.fi>. + * ftparchive/apt-ftparchive.cc: + - Call setlocale() so translations are actually used. -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200 diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 3b1e80631..d0dea7768 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -898,6 +898,7 @@ bool Clean(CommandLine &CmdL) int main(int argc, const char *argv[]) { + setlocale(LC_ALL, ""); CommandLine::Args Args[] = { {'h',"help","help",0}, {0,"md5","APT::FTPArchive::MD5",0}, -- cgit v1.2.3-70-g09d2 From 1baca7b87e96ce282fbcb44a90d8aa89835eeb80 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode <jak@debian.org> Date: Tue, 1 Dec 2009 16:36:48 +0100 Subject: * debian/apt.conf.autoremove: - Add kfreebsd-image-* to the list (Closes: #558803) --- debian/apt.conf.autoremove | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index 98143ce9a..b41be8397 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -4,5 +4,6 @@ APT { "^linux-image.*"; "^linux-restricted-modules.*"; + "^kfreebsd-image.*"; }; }; diff --git a/debian/changelog b/debian/changelog index 3f70b440d..ce1f94078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ apt (0.7.25) UNRELEASED; urgency=low by Jussi Hakala <jussi.hakala@hut.fi>. * ftparchive/apt-ftparchive.cc: - Call setlocale() so translations are actually used. + * debian/apt.conf.autoremove: + - Add kfreebsd-image-* to the list (Closes: #558803) -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 29 Sep 2009 15:51:34 +0200 -- cgit v1.2.3-70-g09d2 From ba00ddd633a9c7f1f04962a3b563fb7c98d7cf2e Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Tue, 1 Dec 2009 21:31:37 +0100 Subject: Simplified CHinese translation update --- debian/changelog | 2 + po/zh_CN.po | 465 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 235 insertions(+), 232 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ce1f94078..6ffa8c33a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #552606 * Italian translation update by Milo Casagrande Closes: #555797 + * Simplified Chinese translation update by Aron Xu + Closes: #558737 [ Michael Vogt ] * apt-pkg/packagemanager.cc: diff --git a/po/zh_CN.po b/po/zh_CN.po index e53f71554..753bba073 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,14 +3,15 @@ # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008. # Tchaikov <tchaikov@sjtu.org>, 2005, 2007. # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006. +# Aron Xu <happyaron.xu@gmail.com>, 2009. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-27 17:32+0200\n" -"PO-Revision-Date: 2009-06-01 15:54+0800\n" -"Last-Translator: Deng Xiyue <manphiz-guest@users.alioth.debian.org>\n" +"PO-Revision-Date: 2009-12-02 01:00+0800\n" +"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +51,7 @@ msgstr " 混合虚拟软件包：" #: cmdline/apt-cache.cc:289 msgid " Missing: " -msgstr " 缺漏的：" +msgstr " 缺失：" #: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " @@ -95,7 +96,7 @@ msgstr "总占用空间：" #: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 #, c-format msgid "Package file %s is out of sync." -msgstr "软件包文件 %s 尚未同步(sync)。" +msgstr "软件包文件 %s 尚未同步。" #: cmdline/apt-cache.cc:1297 msgid "You must give exactly one pattern" @@ -103,7 +104,7 @@ msgstr "您必须明确地给出一个表达式" #: cmdline/apt-cache.cc:1451 msgid "No packages found" -msgstr "没有发现吻合的软件包" +msgstr "没有发现匹配的软件包" #: cmdline/apt-cache.cc:1528 msgid "Package files:" @@ -111,12 +112,12 @@ msgstr "软件包文件：" #: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "缓存尚未同步(sync)，无法交差引证(x-ref)一个软件包文件" +msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1549 msgid "Pinned packages:" -msgstr "被锁定(pinned)的软件包：" +msgstr "被锁定的软件包：" #: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602 msgid "(not found)" @@ -134,11 +135,11 @@ msgstr "(无)" #. Candidate Version #: cmdline/apt-cache.cc:1589 msgid " Candidate: " -msgstr " 候选的软件包：" +msgstr " 候选软件包：" #: cmdline/apt-cache.cc:1599 msgid " Package pin: " -msgstr " 软件包锁(Pin)：" +msgstr " 软件包锁：" #. Show the priority tables #: cmdline/apt-cache.cc:1608 @@ -155,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s for %s 编译于 %s %s\n" +msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" #: cmdline/apt-cache.cc:1725 msgid "" @@ -196,25 +197,25 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" "用法： apt-cache [选项] 命令\n" -" apt-cache [选项] add 文件甲 [文件乙 ...]\n" -" apt-cache [选项] showpkg 软件包甲 [软件包乙 ...]\n" -" apt-cache [选项] showsrc 软件包甲 [软件包乙 ...]\n" +"　　　 apt-cache [选项] add 文件1 [文件2 ...]\n" +"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n" +"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n" "\n" "apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n" "缓存文件，也用来在那些文件中查询相关信息\n" "\n" "命令：\n" -" add - 往源缓存加入一个软件包文件\n" -" gencaches - 一并生成软件包和源代码包的缓存\n" +" add - 向源缓存加入一个软件包文件\n" +" gencaches - 同时生成软件包和源代码包的缓存\n" " showpkg - 显示某个软件包的全面信息\n" " showsrc - 显示源文件的各项记录\n" -" stats - 显示一些基本的统计信息\n" +" stats - 显示基本的统计信息\n" " dump - 简要显示整个缓存文件的内容\n" " dumpavail - 把所有有效的包文件列表打印到标准输出\n" " unmet - 显示所有未满足的依赖关系\n" " search - 根据正则表达式搜索软件包列表\n" " show - 以便于阅读的格式介绍该软件包\n" -" depends - 原原本本地显示该软件包的依赖信息\n" +" depends - 显示该软件包的依赖关系信息\n" " rdepends - 显示所有依赖于该软件包的软件包名字\n" " pkgnames - 列出所有软件包的名字\n" " dotty - 生成可用 GraphViz 处理的软件包关系图\n" @@ -232,17 +233,16 @@ msgstr "" "若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n" #: cmdline/apt-cdrom.cc:77 -#, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "请给这张光盘起个名字，比如说“Debian 2.1r1 Disk 1”" +msgstr "请给这张盘片起个名字，比如“Debian 5.0.3 Disk 1”" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" -msgstr "请把光盘碟片插入驱动器再按回车键" +msgstr "请把盘片插入驱动器再按回车键" #: cmdline/apt-cdrom.cc:114 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "请对您的光盘套件中的其它光盘重复相同的操作。" +msgstr "请对您的盘片套件中的其它盘片重复相同的操作。" #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -265,7 +265,7 @@ msgid "" msgstr "" "用法：apt-config [选项] 命令\n" "\n" -"apt-config 是一个用于读取 APT 配置文件的简单工具\n" +"apt-config 是一个用于读取APT 配置文件的简单工具\n" "\n" "命令：\n" " shell - Shell 模式\n" @@ -312,11 +312,11 @@ msgstr "无法写入 %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "无法获得 debconf 的版本。您安装了 debconf 吗?" +msgstr "无法获得 debconf 的版本。您安装了 debconf 吗？" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" -msgstr "软件包的扩展列表超长" +msgstr "软件包的扩展列表太长" #: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 #: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 @@ -327,16 +327,16 @@ msgstr "处理目录 %s 时出错" #: ftparchive/apt-ftparchive.cc:251 msgid "Source extension list is too long" -msgstr "源扩展列表超长" +msgstr "源扩展列表太长" #: ftparchive/apt-ftparchive.cc:368 msgid "Error writing header to contents file" -msgstr "将 header 写到 contents 文件时出错" +msgstr "将头写入到目录文件时出错" #: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "处理 Contents %s 时出错" +msgstr "处理目录 %s 时出错" #: ftparchive/apt-ftparchive.cc:553 msgid "" @@ -430,38 +430,38 @@ msgstr "软件包文件组“%s”中缺少一些文件" #: ftparchive/cachedb.cc:43 #, c-format msgid "DB was corrupted, file renamed to %s.old" -msgstr "缓存数据库被损坏了，该数据库文件的文件名已改成 %s.old" +msgstr "数据库被损坏，该数据库文件的文件名已改成 %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB 已过时，现试图进行升级 %s" +msgstr "数据库已过期，现尝试进行升级 %s" #: ftparchive/cachedb.cc:72 msgid "" "DB format is invalid. If you upgraded from a older version of apt, please " "remove and re-create the database." msgstr "" -"DB 格式是无效的。如果你是从一个老版本的 apt 升级而来，请删除数据库并重建它。" +"数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "无法打开 DB 文件 %s：%s" +msgstr "无法打开数据库文件 %s：%s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" -msgstr "无法读取 %s 的状态" +msgstr "无法获得 %s 的状态" #: ftparchive/cachedb.cc:238 msgid "Archive has no control record" -msgstr "存档没有包含控制字段" +msgstr "归档文件没有包含控制字段" #: ftparchive/cachedb.cc:444 msgid "Unable to get a cursor" -msgstr "无法获得游标(cursor)" +msgstr "无法获得游标" #: ftparchive/writer.cc:76 #, c-format @@ -471,7 +471,7 @@ msgstr "警告：无法读取目录 %s\n" #: ftparchive/writer.cc:81 #, c-format msgid "W: Unable to stat %s\n" -msgstr "警告：无法对 %s 进行统计\n" +msgstr "警告：无法获得 %s 的状态\n" #: ftparchive/writer.cc:132 msgid "E: " @@ -488,7 +488,7 @@ msgstr "错误：处理文件时出错 " #: ftparchive/writer.cc:158 ftparchive/writer.cc:188 #, c-format msgid "Failed to resolve %s" -msgstr "无法解析路径 %s" +msgstr "无法解析 %s" #: ftparchive/writer.cc:170 msgid "Tree walking failed" @@ -512,7 +512,7 @@ msgstr "无法读取符号链接 %s" #: ftparchive/writer.cc:266 #, c-format msgid "Failed to unlink %s" -msgstr "无法 unlink %s" +msgstr "无法使用 unlink 删除 %s" #: ftparchive/writer.cc:273 #, c-format @@ -526,7 +526,7 @@ msgstr " 达到了 DeLink 的上限 %sB。\n" #: ftparchive/writer.cc:387 msgid "Archive had no package field" -msgstr "存档没有包含软件包(package)字段" +msgstr "归档文件没有包含 package 字段" #: ftparchive/writer.cc:395 ftparchive/writer.cc:610 #, c-format @@ -555,7 +555,7 @@ msgstr "内部错误，无法定位包内文件 %s" #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc - 无法再分配内存" +msgstr "realloc - 分配内存失败" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format @@ -611,11 +611,11 @@ msgstr "压缩子进程" #: ftparchive/multicompress.cc:235 #, c-format msgid "Internal error, failed to create %s" -msgstr "内部错误，无法建立 %s" +msgstr "内部错误，无法创建 %s" #: ftparchive/multicompress.cc:286 msgid "Failed to create subprocess IPC" -msgstr "无法建立子进程的 IPC 管道" +msgstr "无法创建子进程的 IPC 管道" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " @@ -631,12 +631,12 @@ msgstr "无法对子进程或文件进行读写" #: ftparchive/multicompress.cc:455 msgid "Failed to read while computing MD5" -msgstr "在计算 MD5 校验和时，无法读取数据" +msgstr "在计算 MD5 校验和时无法读取数据" #: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "在 unlink %s 时出错" +msgstr "在使用 unlink 删除 %s 时出错" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format @@ -654,12 +654,12 @@ msgstr "编译正则表达式时出错 - %s" #: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" -msgstr "下列的软件包有不能满足的依赖关系：" +msgstr "下列软件包有未满足的依赖关系：" #: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" -msgstr "但是 %s 已经安装了" +msgstr "但是 %s 已经安装" #: cmdline/apt-get.cc:336 #, c-format @@ -668,11 +668,11 @@ msgstr "但是 %s 正要被安装" #: cmdline/apt-get.cc:343 msgid "but it is not installable" -msgstr "但却无法安装它" +msgstr "但无法安装它" #: cmdline/apt-get.cc:345 msgid "but it is a virtual package" -msgstr "但是它只是个虚拟软件包" +msgstr "但是它是虚拟软件包" #: cmdline/apt-get.cc:348 msgid "but it is not installed" @@ -696,11 +696,11 @@ msgstr "下列软件包将被【卸载】：" #: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" -msgstr "下列的软件包的版本将保持不变：" +msgstr "下列软件包的版本将保持不变：" #: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" -msgstr "下列的软件包将被升级：" +msgstr "下列软件包将被升级：" #: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" @@ -720,18 +720,18 @@ msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"【警告】：下列的基础软件包将被卸载。\n" +"【警告】：下列基础软件包将被卸载。\n" "请勿尝试，除非您确实知道您在做什么！" #: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "共升级了 %lu 个软件包，新安装了 %lu 个软件包，" +msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，" #: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " -msgstr "共重新安装了 %lu 个软件包，" +msgstr "重新安装了 %lu 个软件包，" #: cmdline/apt-get.cc:590 #, c-format @@ -741,7 +741,7 @@ msgstr "降级了 %lu 个软件包，" #: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "要卸载 %lu 个软件包，有 %lu 个软件未被升级。\n" +msgstr "要卸载 %lu 个软件包，有 %lu 个软件包未被升级。\n" #: cmdline/apt-get.cc:596 #, c-format @@ -770,7 +770,7 @@ msgstr " 完成" #: cmdline/apt-get.cc:684 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "您也许需要运行“apt-get -f install”来纠正上面的错误。" +msgstr "您也许需要运行“apt-get -f install”来修正上面的错误。" #: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." @@ -778,7 +778,7 @@ msgstr "不能满足依赖关系。不妨试一下 -f 选项。" #: cmdline/apt-get.cc:712 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "【警告】：下列的软件包不能通过验证！" +msgstr "【警告】：下列软件包不能通过验证！" #: cmdline/apt-get.cc:716 msgid "Authentication warning overridden.\n" @@ -786,7 +786,7 @@ msgstr "忽略了认证警告。\n" #: cmdline/apt-get.cc:723 msgid "Install these packages without verification [y/N]? " -msgstr "不经验证就安装这些软件包么？[y/N] " +msgstr "不经验证就安装这些软件包吗？[y/N] " #: cmdline/apt-get.cc:725 msgid "Some packages could not be authenticated" @@ -810,16 +810,16 @@ msgstr "内部错误，Ordering 未能完成" #: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 msgid "Unable to lock the download directory" -msgstr "无法对下载目录加锁" +msgstr "无法锁定下载目录" #: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." -msgstr "无法读取安装源列表。" +msgstr "无法读取源列表。" #: cmdline/apt-get.cc:836 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "怪了……文件大小不符，发信给 apt@packages.debian.org 吧" +msgstr "怪了……文件大小不符，请发信给 apt@packages.debian.org 吧" #: cmdline/apt-get.cc:841 #, c-format @@ -844,20 +844,20 @@ msgstr "解压缩后将会空出 %sB 的空间。\n" #: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 #, c-format msgid "Couldn't determine free space in %s" -msgstr "无法获知您在 %s 上的空余空间" +msgstr "无法获知您在 %s 上的可用空间" #: cmdline/apt-get.cc:876 #, c-format msgid "You don't have enough free space in %s." -msgstr "您在 %s 中没有足够的空余空间。" +msgstr "您在 %s 上没有足够的可用空间。" #: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "虽然您指定了 Trivial Only，但这不是个日常(trivial)操作。" +msgstr "虽然您指定了仅执行常规操作，但这不是个常规操作。" #: cmdline/apt-get.cc:894 msgid "Yes, do as I say!" -msgstr "Yes, do as I say!" +msgstr "是，按我说的做！" #: cmdline/apt-get.cc:896 #, c-format @@ -885,7 +885,7 @@ msgstr "无法下载 %s %s\n" #: cmdline/apt-get.cc:1007 msgid "Some files failed to download" -msgstr "有一些文件下载失败" +msgstr "有一些文件无法下载" #: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 msgid "Download complete and in download only mode" @@ -901,7 +901,7 @@ msgstr "" #: cmdline/apt-get.cc:1018 msgid "--fix-missing and media swapping is not currently supported" -msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)" +msgstr "目前还不支持 --fix-missing 和介质交换" #: cmdline/apt-get.cc:1023 msgid "Unable to correct missing packages." @@ -909,7 +909,7 @@ msgstr "无法更正缺少的软件包。" #: cmdline/apt-get.cc:1024 msgid "Aborting install." -msgstr "放弃安装。" +msgstr "中止安装。" #: cmdline/apt-get.cc:1082 #, c-format @@ -952,7 +952,7 @@ msgstr "" #: cmdline/apt-get.cc:1163 msgid "However the following packages replace it:" -msgstr "可是下列的软件包取代了它：" +msgstr "可是下列软件包取代了它：" #: cmdline/apt-get.cc:1166 #, c-format @@ -987,11 +987,11 @@ msgstr "选定了版本为 %s (%s) 的 %s\n" #: cmdline/apt-get.cc:1348 #, c-format msgid "No source package '%s' picking '%s' instead\n" -msgstr "" +msgstr "没有源代码包“%s”，使用“%s”代替\n" #: cmdline/apt-get.cc:1385 msgid "The update command takes no arguments" -msgstr " update 命令是不需任何参数的" +msgstr " update 命令不需要参数" #: cmdline/apt-get.cc:1398 msgid "Unable to lock the list directory" @@ -1005,12 +1005,12 @@ msgstr "我们不应该进行删除，无法启动自动删除器" msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "下列软件包是自动安装的并且现在不再被使用了：" +msgstr "下列软件包是自动安装的并且现在不需要了：" #: cmdline/apt-get.cc:1505 -#, fuzzy, c-format +#, c-format msgid "%lu packages were automatically installed and are no longer required.\n" -msgstr "下列软件包是自动安装的并且现在不再被使用了：" +msgstr "%lu 个自动安装的的软件包现在不需要了\n" #: cmdline/apt-get.cc:1506 msgid "Use 'apt-get autoremove' to remove them." @@ -1020,7 +1020,7 @@ msgstr "使用'apt-get autoremove'来删除它们" msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." -msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 apt 提交错误报告。" +msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。" #. #. if (Packages == 1) @@ -1034,15 +1034,15 @@ msgstr "似乎自动删除器毁掉了一些软件，这不应该发生。请向 #. #: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 msgid "The following information may help to resolve the situation:" -msgstr "下列的信息可能会对解决问题有所帮助：" +msgstr "下列信息可能会对解决问题有所帮助：" #: cmdline/apt-get.cc:1518 msgid "Internal Error, AutoRemover broke stuff" -msgstr "内部错误，自动删除器坏事了" +msgstr "内部错误，自动删除工具坏事了" #: cmdline/apt-get.cc:1537 msgid "Internal error, AllUpgrade broke stuff" -msgstr "内部错误，全部升级坏事了" +msgstr "内部错误，全部升级工具坏事了" #: cmdline/apt-get.cc:1592 #, c-format @@ -1083,13 +1083,13 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"有一些软件包无法被安装。如果您用的是不稳定(unstable)发行版，这也许是\n" +"有一些软件包无法被安装。如果您用的是 unstable 发行版，这也许是\n" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" -"包尚未被创建或是它们还在新到(incoming)目录中。" +"包尚未被创建或是它们已被从新到(Incoming)目录移出。" #: cmdline/apt-get.cc:1807 msgid "Broken packages" -msgstr "无法安装的软件包" +msgstr "破损的软件包" #: cmdline/apt-get.cc:1836 msgid "The following extra packages will be installed:" @@ -1105,7 +1105,7 @@ msgstr "推荐安装的软件包：" #: cmdline/apt-get.cc:1955 msgid "Calculating upgrade... " -msgstr "正在筹划升级... " +msgstr "正在对升级进行计算... " #: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" @@ -1117,7 +1117,7 @@ msgstr "完成" #: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 msgid "Internal error, problem resolver broke stuff" -msgstr "内部错误，问题解决器坏事了" +msgstr "内部错误，问题解决工具坏事了" #: cmdline/apt-get.cc:2138 msgid "Must specify at least one package to fetch source for" @@ -1136,7 +1136,7 @@ msgstr "忽略已下载过的文件“%s”\n" #: cmdline/apt-get.cc:2248 #, c-format msgid "You don't have enough free space in %s" -msgstr "您在 %s 上没有足够的空余空间" +msgstr "您在 %s 上没有足够的可用空间" #: cmdline/apt-get.cc:2254 #, c-format @@ -1160,7 +1160,7 @@ msgstr "有一些包文件无法下载。" #: cmdline/apt-get.cc:2322 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n" +msgstr "忽略已经被解包到 %s 目录的源代码包\n" #: cmdline/apt-get.cc:2334 #, c-format @@ -1183,12 +1183,12 @@ msgstr "子进程出错" #: cmdline/apt-get.cc:2387 msgid "Must specify at least one package to check builddeps for" -msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包" +msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" #: cmdline/apt-get.cc:2415 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息" +msgstr "无法获得 %s 的构建依赖关系信息" #: cmdline/apt-get.cc:2435 #, c-format @@ -1214,7 +1214,7 @@ msgstr "" #: cmdline/apt-get.cc:2576 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新了" +msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：已安装的软件包 %3$s 太新" #: cmdline/apt-get.cc:2603 #, c-format @@ -1232,10 +1232,9 @@ msgstr "无法处理构建依赖关系" #: cmdline/apt-get.cc:2656 msgid "Supported modules:" -msgstr "被支持模块：" +msgstr "支持的模块：" #: cmdline/apt-get.cc:2697 -#, fuzzy msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1279,8 +1278,8 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" "用法： apt-get [选项] 命令\n" -" apt-get [选项] install|remove 软件包1 [软件包2 ...]\n" -" apt-get [选项] source 软件包1 [软件包2 ...]\n" +"　　　 apt-get [选项] install|remove 软件包1 [软件包2 ...]\n" +"　　　 apt-get [选项] source 软件包1 [软件包2 ...]\n" "\n" "apt-get 提供了一个用于下载和安装软件包的简易命令行界面。\n" "最常用命令是 update 和 install。\n" @@ -1307,8 +1306,8 @@ msgstr "" " -d 仅仅下载 - 【不】安装或解开包文件\n" " -s 不作实际操作。只是依次模拟执行命令\n" " -y 对所有询问都回答是(Yes)，同时不作任何提示\n" -" -f 当出现破损的依赖关系时，程序将试图修正系统\n" -" -m 当有包文件无法找到时，程序仍试图继续执行\n" +" -f 当出现破损的依赖关系时，程序将尝试修正系统\n" +" -m 当有包文件无法找到时，程序仍尝试继续执行\n" " -u 显示已升级的软件包列表\n" " -b 在下载完源码包后，编译生成相应的软件包\n" " -V 显示详尽的版本号\n" @@ -1316,7 +1315,7 @@ msgstr "" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" "请查阅 apt-get(8)、sources.list(5) 和 apt.conf(5)的参考手册\n" "以获取更多信息和选项。\n" -" 本 APT 有着超级牛力。\n" +" 本 APT 具有超级牛力。\n" #: cmdline/apt-get.cc:2864 msgid "" @@ -1325,6 +1324,9 @@ msgid "" " Keep also in mind that locking is deactivated,\n" " so don't depend on the relevance to the real current situation!" msgstr "" +"注意：这只是模拟！\n" +"　　　apt-get 需要 root 特权进行实际的执行。\n" +"　　　同时请记住此时并未锁定，所以请勿完全相信当前的情况！" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1361,7 +1363,7 @@ msgid "" msgstr "" "更换介质：请把标有\n" "“%s”\n" -"的碟片插入驱动器“%s”再按回车键\n" +"的盘片插入驱动器“%s”再按回车键\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1405,14 +1407,12 @@ msgid "Do you want to erase any previously downloaded .deb files?" msgstr "您想要删除之前下载的所有 .deb 文件吗？" #: dselect/install:101 -#, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "在解包时发生了一些错误。我正准备配置" +msgstr "在解包时发生了一些错误。已经安装的软件包" #: dselect/install:102 -#, fuzzy msgid "will be configured. This may result in duplicate errors" -msgstr "已经安装的软件包。这个操作可能会导致出现重复的错误" +msgstr "将被配置。这个操作可能会导致出现重复的错误" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" @@ -1425,7 +1425,7 @@ msgstr "这个提示之前的错误消息才值得您注意。请更正它们， #: dselect/update:30 msgid "Merging available information" -msgstr "正在合并现有信息" +msgstr "正在合并可用信息" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1441,7 +1441,7 @@ msgstr "包文件已被损坏" #: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "tar 的校验码不符，包文件已被损坏" +msgstr "Tar 的校验和不符，文件已损坏" #: apt-inst/contrib/extracttar.cc:296 #, c-format @@ -1450,28 +1450,28 @@ msgstr "未知的 TAR 数据头类型 %u，成员 %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" -msgstr "无效的打包文件特征号(signature)" +msgstr "无效的归档签名" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "读取打包文件中的成员文件头出错" +msgstr "读取归档成员文件头出错" #: apt-inst/contrib/arfile.cc:90 -#, fuzzy, c-format +#, c-format msgid "Invalid archive member header %s" -msgstr "打包文件中成员文件头无效" +msgstr "归档文件中成员文件头 %s 无效" #: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" -msgstr "打包文件中成员文件头无效" +msgstr "归档文件中成员文件头无效" #: apt-inst/contrib/arfile.cc:128 msgid "Archive is too short" -msgstr "存档太短了" +msgstr "归档文件太短" #: apt-inst/contrib/arfile.cc:132 msgid "Failed to read the archive headers" -msgstr "无法读取打包文件的数据头" +msgstr "无法读取归档文件的数据头" #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" @@ -1479,11 +1479,11 @@ msgstr "把 DropNode 用在了仍在链表中的节点上" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "无法分配散列表项！" +msgstr "无法定位哈希表元素！" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" -msgstr "无法分配转移项(diversion)" +msgstr "无法分配转移项" #: apt-inst/filelist.cc:464 msgid "Internal error in AddDiversion" @@ -1492,12 +1492,12 @@ msgstr "内部错误，出现在 AddDiversion" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "试图覆盖一个转移项(diversion)，%s -> %s 即 %s/%s" +msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "添加了两个转移项(diversion) %s-> %s" +msgstr "添加了两个转移项 %s-> %s" #: apt-inst/filelist.cc:549 #, c-format @@ -1517,7 +1517,7 @@ msgstr "无法关闭文件 %s" #: apt-inst/extract.cc:93 apt-inst/extract.cc:164 #, c-format msgid "The path %s is too long" -msgstr "路径名 %s 过长" +msgstr "路径名 %s 太长" #: apt-inst/extract.cc:124 #, c-format @@ -1527,16 +1527,16 @@ msgstr "%s 被解包了不只一次" #: apt-inst/extract.cc:134 #, c-format msgid "The directory %s is diverted" -msgstr "目录 %s 已被转移(diverted)" +msgstr "目录 %s 已被转移" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "该软件包正尝试写入转移对象(diversion target) %s/%s" +msgstr "该软件包正尝试写入转移对象 %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" -msgstr "该转移路径(diversion path)过长" +msgstr "该转移路径太长" #: apt-inst/extract.cc:240 #, c-format @@ -1545,11 +1545,11 @@ msgstr "目录 %s 要被一个非目录的文件替换" #: apt-inst/extract.cc:280 msgid "Failed to locate node in its hash bucket" -msgstr "无法在其散列桶(hash bucket)中分配节点" +msgstr "无法在其散列桶中分配节点" #: apt-inst/extract.cc:284 msgid "The path is too long" -msgstr "路径名过长" +msgstr "路径名太长" #: apt-inst/extract.cc:414 #, c-format @@ -1624,8 +1624,8 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件，再马上" -"重新安装相同版本的这个软件包！" +"无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马上重" +"新安装相同版本的这个软件包！" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format @@ -1639,11 +1639,11 @@ msgstr "获得一个节点时出现内部错误" #: apt-inst/deb/dpkgdb.cc:305 #, c-format msgid "Failed to open the diversions file %sdiversions" -msgstr "无法打开转移配置文件(diversions file) %sdiversions" +msgstr "无法打开转移配置文件 %sdiversions" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "该转移配置文件(diversion file)被损坏了" +msgstr "该转移配置文件被损坏了" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 @@ -1653,7 +1653,7 @@ msgstr "转移配置文件中有一行是无效的：%s" #: apt-inst/deb/dpkgdb.cc:358 msgid "Internal error adding a diversion" -msgstr "添加 diversion 时出现内部错误" +msgstr "添加转移配置时出现内部错误" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" @@ -1672,7 +1672,7 @@ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "无法解析 MD5 码。文件内偏移量为 %lu" +msgstr "解析 MD5 出错。文件内偏移量为 %lu" #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format @@ -1695,7 +1695,7 @@ msgstr "内部错误，无法定位包内文件" #: apt-inst/deb/debfile.cc:173 msgid "Failed to locate a valid control file" -msgstr "无法在打包文件中找到有效的主控文件" +msgstr "无法在归档文件中找到有效的主控文件" #: apt-inst/deb/debfile.cc:258 msgid "Unparsable control file" @@ -1704,19 +1704,19 @@ msgstr "不能解析的主控文件" #: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" -msgstr "无法读取光盘数据库 %s" +msgstr "无法读取盘片数据库 %s" #: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -"请使用 apt-cdrom，通过它就可以让 APT 能识别该光盘。apt-get upgdate 不能被用来" -"加入新的光盘。" +"请使用 apt-cdrom，通过它就可以让 APT 能识别该盘片。apt-get upgdate 不能被用来" +"加入新的盘片。" #: methods/cdrom.cc:219 msgid "Wrong CD-ROM" -msgstr "错误的光盘" +msgstr "错误的 CD-ROM" #: methods/cdrom.cc:245 #, c-format @@ -1725,7 +1725,7 @@ msgstr "无法卸载现在挂载于 %s 的 CD-ROM，它可能正在使用中。" #: methods/cdrom.cc:250 msgid "Disk not found." -msgstr "找不到光盘。" +msgstr "找不到盘片。" #: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" @@ -1760,17 +1760,17 @@ msgstr "无法获知本地主机名" #: methods/ftp.cc:209 methods/ftp.cc:237 #, c-format msgid "The server refused the connection and said: %s" -msgstr "服务器拒绝了我们的连接，它响应道：%s" +msgstr "服务器拒绝了我们的连接，响应信息为：%s" #: methods/ftp.cc:215 #, c-format msgid "USER failed, server said: %s" -msgstr "USER 指令出错，服务器响应道：%s" +msgstr "USER 指令出错，服务器响应信息为：%s" #: methods/ftp.cc:222 #, c-format msgid "PASS failed, server said: %s" -msgstr "PASS 指令出错，服务器响应道：%s" +msgstr "PASS 指令出错，服务器响应信息为：%s" #: methods/ftp.cc:242 msgid "" @@ -1782,12 +1782,12 @@ msgstr "" #: methods/ftp.cc:270 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "登录脚本命令“%s”出错，服务器响应道：%s" +msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" #: methods/ftp.cc:296 #, c-format msgid "TYPE failed, server said: %s" -msgstr "TYPE 指令出错，服务器响应道：%s" +msgstr "TYPE 指令出错，服务器响应信息为：%s" #: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1811,11 +1811,11 @@ msgstr "协议有误" #: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" -msgstr "写文件出错" +msgstr "写出错" #: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 msgid "Could not create a socket" -msgstr "不能创建套接字" +msgstr "无法创建套接字" #: methods/ftp.cc:703 msgid "Could not connect data socket, connection timed out" @@ -1827,7 +1827,7 @@ msgstr "无法连接被动模式的套接字。" #: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" -msgstr "getaddrinfo 无法得到侦听套接字" +msgstr "getaddrinfo 无法得到监听套接字" #: methods/ftp.cc:741 msgid "Could not bind a socket" @@ -1835,7 +1835,7 @@ msgstr "无法绑定套接字" #: methods/ftp.cc:745 msgid "Could not listen on the socket" -msgstr "无法在套接字上侦听" +msgstr "无法在套接字上监听" #: methods/ftp.cc:752 msgid "Could not determine the socket's name" @@ -1853,7 +1853,7 @@ msgstr "无法识别的地址族 %u (AF_*)" #: methods/ftp.cc:803 #, c-format msgid "EPRT failed, server said: %s" -msgstr "EPRT 指令出错，服务器响应道：%s" +msgstr "EPRT 指令出错，服务器响应信息为：%s" #: methods/ftp.cc:823 msgid "Data socket connect timed out" @@ -1865,12 +1865,12 @@ msgstr "无法接受连接" #: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 msgid "Problem hashing file" -msgstr "把文件加入散列表时出错" +msgstr "把文件加入哈希表时出错" #: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "无法获取文件，服务器响应道“%s”" +msgstr "无法获取文件，服务器响应信息为“%s”" #: methods/ftp.cc:897 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1879,7 +1879,7 @@ msgstr "数据套接字超时" #: methods/ftp.cc:927 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "数据传送出错，服务器响应道“%s”" +msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information #: methods/ftp.cc:1002 @@ -1940,26 +1940,26 @@ msgstr "暂时不能解析域名“%s”" #: methods/connect.cc:193 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "解析“%s:%s”时，出现了某些故障 (%i)" +msgstr "解析“%s:%s”时，出现了某些故障(%i)" #: methods/connect.cc:240 -#, fuzzy, c-format +#, c-format msgid "Unable to connect to %s:%s:" -msgstr "不能连接上 %s %s：" +msgstr "不能连接到 %s：%s：" #: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" -msgstr "无法访问密匙：“%s”" +msgstr "无法访问密钥环：“%s”" #: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。" +msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。" #: methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！" +msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" #: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." @@ -1968,7 +1968,7 @@ msgstr "至少发现一个无效的签名。" #: methods/gpgv.cc:232 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" -msgstr "无法运行\"%s\"以验证签名(您安装了 gpgv 么？)" +msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)" #: methods/gpgv.cc:237 msgid "Unknown error executing gpgv" @@ -1982,7 +1982,7 @@ msgstr "下列签名无效：\n" msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "由于没有公钥，下列签名无法进行验证：\n" +msgstr "由于没有公钥，无法验证下列签名：\n" #: methods/gzip.cc:64 #, c-format @@ -2001,27 +2001,27 @@ msgstr "正在等待报头" #: methods/http.cc:530 #, c-format msgid "Got a single header line over %u chars" -msgstr "受到了一行报头条目，它的长度超过了 %u 个字符" +msgstr "接收到一行报头行，它的长度超过了 %u 个字符" #: methods/http.cc:538 msgid "Bad header line" -msgstr "错误的报头条目" +msgstr "错误的报头行" #: methods/http.cc:557 methods/http.cc:564 msgid "The HTTP server sent an invalid reply header" -msgstr "该 http 服务器发送了一个无效的应答报头" +msgstr "该 HTTP 服务器发送了一个无效的应答报头" #: methods/http.cc:593 msgid "The HTTP server sent an invalid Content-Length header" -msgstr "该 http 服务器发送了一个无效的 Content-Length 报头" +msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" #: methods/http.cc:608 msgid "The HTTP server sent an invalid Content-Range header" -msgstr "该 http 服务器发送了一个无效的 Content-Range 报头" +msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" #: methods/http.cc:610 msgid "This HTTP server has broken range support" -msgstr "该 http 服务器的 range 支持不正常" +msgstr "该 HTTP 服务器的 range 支持不正常" #: methods/http.cc:634 msgid "Unknown date format" @@ -2033,7 +2033,7 @@ msgstr "select 调用出错" #: methods/http.cc:792 msgid "Connection timed out" -msgstr "连接服务器超时" +msgstr "连接超时" #: methods/http.cc:815 msgid "Error writing to output file" @@ -2041,11 +2041,11 @@ msgstr "写输出文件时出错" #: methods/http.cc:846 msgid "Error writing to file" -msgstr "写文件时出错" +msgstr "写入文件出错" #: methods/http.cc:874 msgid "Error writing to the file" -msgstr "写文件时出错" +msgstr "写入文件出错" #: methods/http.cc:888 msgid "Error reading from server. Remote end closed connection" @@ -2057,7 +2057,7 @@ msgstr "从服务器读取数据出错" #: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" -msgstr "截断文件失败" +msgstr "无法截断文件" #: methods/http.cc:1146 msgid "Bad header data" @@ -2086,37 +2086,37 @@ msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大侠。当前值：%lu。(man 5 " +"动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 " "apt.conf)" #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format msgid "%lid %lih %limin %lis" -msgstr "" +msgstr "%li天 %li小时 %li分 %li秒" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:353 #, c-format msgid "%lih %limin %lis" -msgstr "" +msgstr "%li小时 %li分 %li秒" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:360 #, c-format msgid "%limin %lis" -msgstr "" +msgstr "%li分 %li秒" #. s means seconds #: apt-pkg/contrib/strutl.cc:365 #, c-format msgid "%lis" -msgstr "" +msgstr "%li秒" #: apt-pkg/contrib/strutl.cc:1040 #, c-format msgid "Selection %s not found" -msgstr "没有发现您的所选 %s" +msgstr "找不到您选则的 %s" #: apt-pkg/contrib/configuration.cc:458 #, c-format @@ -2171,7 +2171,7 @@ msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" #: apt-pkg/contrib/progress.cc:153 #, c-format msgid "%c%s... Error!" -msgstr "%c%s... 有错误!" +msgstr "%c%s... 有错误！" #: apt-pkg/contrib/progress.cc:155 #, c-format @@ -2181,7 +2181,7 @@ msgstr "%c%s... 完成" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "未知的命令行选项“%c”[来自 %s]" +msgstr "未知的命令行选项“%c” [来自 %s]" #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 @@ -2192,7 +2192,7 @@ msgstr "无法识别命令行选项 %s" #: apt-pkg/contrib/cmndline.cc:124 #, c-format msgid "Command line option %s is not boolean" -msgstr "命令行选项 %s 不是个布尔值" +msgstr "命令行选项 %s 不是布尔值" #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format @@ -2212,7 +2212,7 @@ msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”" #: apt-pkg/contrib/cmndline.cc:265 #, c-format msgid "Option '%s' is too long" -msgstr "选项“%s”超长" +msgstr "选项“%s”太长" #: apt-pkg/contrib/cmndline.cc:298 #, c-format @@ -2237,12 +2237,12 @@ msgstr "无法切换工作目录到 %s" #: apt-pkg/contrib/cdromutl.cc:195 msgid "Failed to stat the cdrom" -msgstr "无法读取光盘的状态" +msgstr "无法读取盘片的状态" #: apt-pkg/contrib/fileutl.cc:149 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "由于文件系统为只读，因而无法使用文件锁%s" +msgstr "由于文件系统为只读，因而无法使用文件锁 %s" #: apt-pkg/contrib/fileutl.cc:154 #, c-format @@ -2270,9 +2270,9 @@ msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" #: apt-pkg/contrib/fileutl.cc:458 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "子进程 %s 发生了段错误" +msgstr "子进程 %s 收到信号 %u。" #: apt-pkg/contrib/fileutl.cc:462 #, c-format @@ -2282,7 +2282,7 @@ msgstr "子进程 %s 返回了一个错误号 (%u)" #: apt-pkg/contrib/fileutl.cc:464 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "子进程 %s 异常退出了" +msgstr "子进程 %s 异常退出" #: apt-pkg/contrib/fileutl.cc:508 #, c-format @@ -2292,24 +2292,24 @@ msgstr "无法打开文件 %s" #: apt-pkg/contrib/fileutl.cc:564 #, c-format msgid "read, still have %lu to read but none left" -msgstr "读文件时出错，还剩 %lu 字节没有读出" +msgstr "读取文件出错，还剩 %lu 字节没有读出" #: apt-pkg/contrib/fileutl.cc:594 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "写文件时出错，还剩 %lu 字节没有保存" +msgstr "写入文件出错，还剩 %lu 字节没有保存" #: apt-pkg/contrib/fileutl.cc:669 msgid "Problem closing the file" -msgstr "关闭文件时出错" +msgstr "关闭文件出错" #: apt-pkg/contrib/fileutl.cc:675 msgid "Problem unlinking the file" -msgstr "用 unlink 删除文件时出错" +msgstr "用 unlink 删除文件出错" #: apt-pkg/contrib/fileutl.cc:686 msgid "Problem syncing the file" -msgstr "同步文件时出错" +msgstr "同步文件出错" #: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" @@ -2317,7 +2317,7 @@ msgstr "软件包缓存区是空的" #: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" -msgstr "软件包缓存区文件损坏了" +msgstr "软件包缓存文件损坏了" #: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" @@ -2326,11 +2326,11 @@ msgstr "软件包缓存区文件的版本不兼容" #: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "本程序目前不支持“%s”这个版本控制系统" +msgstr "本程序目前不支持“%s”版本系统" #: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" -msgstr "软件包缓存区是为其它架构的主机构造的" +msgstr "软件包缓存区是为其它架构的硬件构建的" #: apt-pkg/pkgcache.cc:225 msgid "Depends" @@ -2366,7 +2366,7 @@ msgstr "破坏" #: apt-pkg/pkgcache.cc:227 msgid "Enhances" -msgstr "" +msgstr "增强" #: apt-pkg/pkgcache.cc:238 msgid "important" @@ -2374,7 +2374,7 @@ msgstr "重要" #: apt-pkg/pkgcache.cc:238 msgid "required" -msgstr "必要" +msgstr "必需" #: apt-pkg/pkgcache.cc:238 msgid "standard" @@ -2427,27 +2427,27 @@ msgstr "无法解析软件包文件 %s (2)" #: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误 (URI)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" #: apt-pkg/sourcelist.cc:92 #, c-format msgid "Malformed line %lu in source list %s (dist)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" #: apt-pkg/sourcelist.cc:95 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (URI parse)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" #: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (Ablolute dist)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" #: apt-pkg/sourcelist.cc:108 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误 (dist parse)" +msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" #: apt-pkg/sourcelist.cc:206 #, c-format @@ -2457,22 +2457,22 @@ msgstr "正在打开 %s" #: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." -msgstr "软件包来源档 %2$s 的第 %1$u 行超长了。" +msgstr "源列表 %2$s 的第 %1$u 行太长了。" #: apt-pkg/sourcelist.cc:243 #, c-format msgid "Malformed line %u in source list %s (type)" -msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)" +msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" #: apt-pkg/sourcelist.cc:247 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" +msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" #: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 #, c-format msgid "Malformed line %u in source list %s (vendor id)" -msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (vendor id)" +msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)" #: apt-pkg/packagemanager.cc:436 #, c-format @@ -2520,12 +2520,12 @@ msgstr "" #: apt-pkg/acquire.cc:60 #, c-format msgid "Lists directory %spartial is missing." -msgstr "软件包列表的目录 %spartial 不见了。" +msgstr "软件包列表的目录 %spartial 缺失。" #: apt-pkg/acquire.cc:64 #, c-format msgid "Archive directory %spartial is missing." -msgstr "找不到“%spartial”这个目录。" +msgstr "找不到“%spartial”目录。" #. only show the ETA if it makes sense #. two days @@ -2552,7 +2552,7 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" #: apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "请把标有 “%s” 的碟片插入驱动器“%s”再按回车键。" +msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" #: apt-pkg/init.cc:132 #, c-format @@ -2570,7 +2570,7 @@ msgstr "无法读取 %s 的状态。" #: apt-pkg/srcrecords.cc:44 msgid "You must put some 'source' URIs in your sources.list" -msgstr "您必须在您的 sources.list 写入一些“软件包源”的 URI" +msgstr "您必须在您的 sources.list 写入一些“软件源”的 URI" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." @@ -2581,14 +2581,14 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" #: apt-pkg/policy.cc:347 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "偏好设定(preferences)文件中发现有无效的记录，无 Package 字段头" +msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" #: apt-pkg/policy.cc:369 #, c-format msgid "Did not understand pin type %s" -msgstr "无法识别锁定的类型(pin type) %s" +msgstr "无法识别锁定的类型 %s" #: apt-pkg/policy.cc:377 msgid "No priority (or zero) specified for pin" @@ -2645,19 +2645,19 @@ msgstr "处理 %s (NewFileDesc2)时出错" #: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "糟了，软件包的数量了超出本程序的处理能力。" +msgstr "哇，软件包数量超出了本 APT 的处理能力。" #: apt-pkg/pkgcachegen.cc:267 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "糟了，软件包版本的数量了超出本程序的处理能力。" +msgstr "哇，软件包版本数量超出了本 APT 的处理能力。" #: apt-pkg/pkgcachegen.cc:270 msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "糟了，软件包说明的数量了超出本程序的处理能力。" +msgstr "哇，软件包说明数量超出了本 APT 的处理能力。" #: apt-pkg/pkgcachegen.cc:273 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "糟了，依赖关系的数量超出了本程序的处理能力。" +msgstr "哇，依赖关系数量超出了本 APT 的处理能力。" #: apt-pkg/pkgcachegen.cc:301 #, c-format @@ -2685,7 +2685,7 @@ msgstr "正在收集文件所提供的软件包" #: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 msgid "IO Error saving source cache" -msgstr "无法写入来源缓存文件" +msgstr "无法读取或写入软件源缓存" #: apt-pkg/acquire-item.cc:128 #, c-format @@ -2702,7 +2702,7 @@ msgstr "Hash 校验和不符" #: apt-pkg/acquire-item.cc:1106 msgid "There is no public key available for the following key IDs:\n" -msgstr "以下 key ID 没有可用的公钥：\n" +msgstr "以下 ID 的密钥没有可用的公钥：\n" #: apt-pkg/acquire-item.cc:1216 #, c-format @@ -2732,19 +2732,19 @@ msgid "Size mismatch" msgstr "大小不符" #: apt-pkg/indexrecords.cc:40 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "无法解析软件包文件 %s (1)" +msgstr "无法解析软件包仓库 Release 文件 %s" #: apt-pkg/indexrecords.cc:47 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "注意，选取 %s 而非 %s\n" +msgstr "软件包仓库 Release 文件 %s 内无组件章节信息" #: apt-pkg/indexrecords.cc:81 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "软件包仓库 Release 文件 %s 内无哈希条目" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2767,7 +2767,7 @@ msgstr "正在鉴别.. " #: apt-pkg/cdrom.cc:559 #, c-format msgid "Stored label: %s\n" -msgstr "已存档的标签：%s\n" +msgstr "已归档文件的标签：%s\n" #: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM...\n" @@ -2793,7 +2793,7 @@ msgstr "正在挂载 CD-ROM 文件系统……\n" #: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" -msgstr "正在光盘中查找索引文件..\n" +msgstr "正在盘片中查找索引文件..\n" #: apt-pkg/cdrom.cc:673 #, c-format @@ -2809,6 +2809,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"无法确定任何包文件的位置，可能这不是一张 Debian 盘片或者是选择了错误的硬件构" +"架。" #: apt-pkg/cdrom.cc:710 #, c-format @@ -2817,7 +2819,7 @@ msgstr "找到标签 '%s'\n" #: apt-pkg/cdrom.cc:739 msgid "That is not a valid name, try again.\n" -msgstr "这不是一个有效的名字，请再次命名。\n" +msgstr "这不是一个有效的名字，请重试。\n" #: apt-pkg/cdrom.cc:755 #, c-format @@ -2825,7 +2827,7 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"这张光盘现在的名字是：\n" +"这张盘片现在的名字是：\n" "“%s”\n" #: apt-pkg/cdrom.cc:759 @@ -2834,11 +2836,11 @@ msgstr "正在复制软件包列表……" #: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" -msgstr "正在写入新的软件包源列表\n" +msgstr "正在写入新的源列表\n" #: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" -msgstr "对应于该光盘的软件包源设置项是：\n" +msgstr "对应于该盘片的软件源设置项是：\n" #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 #, c-format @@ -2853,12 +2855,12 @@ msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n" #: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840 #, c-format msgid "Wrote %i records with %i mismatched files\n" -msgstr "已写入 %i 条记录，并有 %i 个文件不吻合\n" +msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" #: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不吻合\n" +msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" #: apt-pkg/deb/dpkgpm.cc:49 #, c-format @@ -2927,33 +2929,33 @@ msgstr "完全删除了 %s" #: apt-pkg/deb/dpkgpm.cc:878 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "无法写入日志。 openpty() 失败 (/dev/pts 没有 mount 上？)\n" +msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n" #: apt-pkg/deb/dpkgpm.cc:907 msgid "Running dpkg" -msgstr "" +msgstr "正在运行 dpkg" #: apt-pkg/deb/debsystem.cc:70 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" -msgstr "" +msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？" #: apt-pkg/deb/debsystem.cc:73 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "无法对状态列表目录加锁" +msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？" #: apt-pkg/deb/debsystem.cc:82 msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " -msgstr "" +msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。" #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -msgstr "" +msgstr "未锁定" #: methods/rred.cc:219 msgid "Could not patch file" @@ -2981,7 +2983,7 @@ msgstr "连接被永久关闭" #~ "您最好提交一个针对这个软件包的故障报告。" #~ msgid "Line %d too long (max %lu)" -#~ msgstr "第 %d 行超长了(长度限制为 %lu)。" +#~ msgstr "第 %d 行太长了(长度限制为 %lu)。" #~ msgid "After unpacking %sB of additional disk space will be used.\n" #~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" @@ -2993,7 +2995,7 @@ msgstr "连接被永久关闭" #~ msgstr "%s 已设置为手动安装。\n" #~ msgid "Line %d too long (max %d)" -#~ msgstr "第 %d 行超长了(长度限制为 %d)" +#~ msgstr "第 %d 行太长了(长度限制为 %d)" #~ msgid "Error occured while processing %s (NewFileDesc1)" #~ msgstr "处理 %s (NewFileDesc1)时出错" @@ -3002,7 +3004,7 @@ msgstr "连接被永久关闭" #~ msgstr "处理 %s (NewFileDesc2)时出错" #~ msgid "Stored label: %s \n" -#~ msgstr "存档标签：%s \n" +#~ msgstr "归档文件标签：%s \n" #~ msgid "" #~ "Found %i package indexes, %i source indexes, %i translation indexes and %" @@ -3030,5 +3032,4 @@ msgstr "连接被永久关闭" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "" -#~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%" -#~ "1$s”" +#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”" -- cgit v1.2.3-70-g09d2 From 1eb5622017241e874016b759625b2b706ed9a74c Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Thu, 3 Dec 2009 22:04:09 +0100 Subject: Slovak translation update --- debian/changelog | 2 ++ po/sk.po | 54 ++++++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 26 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5cff0919a..cf1977286 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #555797 * Simplified Chinese translation update by Aron Xu Closes: #558737 + * Slovak translation update by Ivan Masár + Closes: #559277 [ Michael Vogt ] * apt-pkg/packagemanager.cc: diff --git a/po/sk.po b/po/sk.po index a1f81dd43..4e86e2f00 100644 --- a/po/sk.po +++ b/po/sk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-09-27 17:32+0200\n" -"PO-Revision-Date: 2009-07-21 12:45+0100\n" +"PO-Revision-Date: 2009-12-03 09:20+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" "MIME-Version: 1.0\n" @@ -235,9 +235,8 @@ msgstr "" "Viac informácií nájdete v manuálových stránkach apt-cache(8) a apt.conf(5).\n" #: cmdline/apt-cdrom.cc:77 -#, fuzzy msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" -msgstr "Zadajte názov tohto disku, napríklad „Debian 2.1r1 Disk 1“" +msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" @@ -1014,10 +1013,10 @@ msgstr "" "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:" #: cmdline/apt-get.cc:1505 -#, fuzzy, c-format +#, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" -"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:" +"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n" #: cmdline/apt-get.cc:1506 msgid "Use 'apt-get autoremove' to remove them." @@ -1422,14 +1421,13 @@ msgid "Do you want to erase any previously downloaded .deb files?" msgstr "Chcete odstrániť všetky doteraz stiahnuté .deb súbory?" #: dselect/install:101 -#, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Pri rozbaľovaní došlo k nejakým chybám. Teraz sa nastavia" +msgstr "" +"Pri rozbaľovaní došlo k nejakým chybám. Balíky, ktoré boli nainštalované" #: dselect/install:102 -#, fuzzy msgid "will be configured. This may result in duplicate errors" -msgstr "balíky, ktoré sa nainštalovali. Môže to spôsobiť chybové správy" +msgstr "budú nakonfigurované. Môže to spôsobiť opakované chybové správy" #: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" @@ -1475,9 +1473,9 @@ msgid "Error reading archive member header" msgstr "Chyba pri čítaní záhlavia prvku archívu" #: apt-inst/contrib/arfile.cc:90 -#, fuzzy, c-format +#, c-format msgid "Invalid archive member header %s" -msgstr "Neplatné záhlavie prvku archívu" +msgstr "Neplatná hlavička prvku archívu %s" #: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" @@ -1963,9 +1961,9 @@ msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i)" #: methods/connect.cc:240 -#, fuzzy, c-format +#, c-format msgid "Unable to connect to %s:%s:" -msgstr "Nedá sa pripojiť k %s %s:" +msgstr "Nedá sa pripojiť k %s:%s:" #: methods/gpgv.cc:71 #, c-format @@ -2295,9 +2293,9 @@ msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržal chybu segmentácie." #: apt-pkg/contrib/fileutl.cc:458 -#, fuzzy, c-format +#, c-format msgid "Sub-process %s received signal %u." -msgstr "Podproces %s obdržal chybu segmentácie." +msgstr "Podproces %s dostal signál %u." #: apt-pkg/contrib/fileutl.cc:462 #, c-format @@ -2605,9 +2603,9 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update" #: apt-pkg/policy.cc:347 -#, fuzzy, c-format +#, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Neplatný záznam v súbore „preferences“, žiadne záhlavie balíka" +msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package" #: apt-pkg/policy.cc:369 #, c-format @@ -2759,19 +2757,19 @@ msgid "Size mismatch" msgstr "Veľkosti sa nezhodujú" #: apt-pkg/indexrecords.cc:40 -#, fuzzy, c-format +#, c-format msgid "Unable to parse Release file %s" -msgstr "Súbor %s sa nedá spracovať (1)" +msgstr "Nedá spracovať súbor Release %s" #: apt-pkg/indexrecords.cc:47 -#, fuzzy, c-format +#, c-format msgid "No sections in Release file %s" -msgstr "Poznámka: %s sa vyberá namiesto %s\n" +msgstr "Žiadne sekcie v Release súbore %s" #: apt-pkg/indexrecords.cc:81 #, c-format msgid "No Hash entry in Release file %s" -msgstr "" +msgstr "Chýba položka Hash v súbore Release %s" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2836,6 +2834,8 @@ msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" +"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom " +"alebo je pre nesprávnu architektúru?" #: apt-pkg/cdrom.cc:710 #, c-format @@ -2960,25 +2960,27 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:907 msgid "Running dpkg" -msgstr "" +msgstr "Spúšťa sa dpkg" #: apt-pkg/deb/debsystem.cc:70 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" -msgstr "" +msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?" #: apt-pkg/deb/debsystem.cc:73 -#, fuzzy, c-format +#, c-format msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Adresár zoznamov sa nedá zamknúť" +msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?" #: apt-pkg/deb/debsystem.cc:82 msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " msgstr "" +"dpkg bol prerušený, musíte ručne opraviť problém spustením „dpkg --configure " +"-a“. " #: apt-pkg/deb/debsystem.cc:100 msgid "Not locked" -- cgit v1.2.3-70-g09d2 From ac81ae9c07b7f2c3cc5afa76b197086814186557 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 9 Dec 2009 10:56:29 +0100 Subject: * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions --- apt-pkg/deb/dpkgpm.cc | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index ab71d4e96..fe673925b 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -49,6 +49,7 @@ namespace std::make_pair("install", N_("Installing %s")), std::make_pair("configure", N_("Configuring %s")), std::make_pair("remove", N_("Removing %s")), + std::make_pair("purge", N_("Completely removing %s")), std::make_pair("trigproc", N_("Running post-installation trigger %s")) }; diff --git a/debian/changelog b/debian/changelog index 685c048ea..a0166414e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ apt (0.7.22.4) unstable; urgency=low /etc/apt/auth.conf that can be used to store username/passwords in a "netrc" style file (with the extension that it supports "/" in a machine definition). Based on the maemo git branch. + * apt-pkg/deb/dpkgpm.cc: + - add "purge" to list of known actions [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3-70-g09d2 From 8b8fdb116138b3adea3ce3c1fd51b3016902c8a5 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 10 Dec 2009 21:43:34 +0100 Subject: merged -r 1914..1915 from lp:~donkult/apt/sid --- cmdline/apt-mark | 8 ++++++-- debian/changelog | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 226d2079b..c44ce7038 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -31,8 +31,12 @@ def mark_unmark_automatic(filename, action, pkgs): " mark or unmark automatic flag" # open the statefile if os.path.exists(STATE_FILE): - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - outfile = open(STATE_FILE+".tmp","w") + try: + tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + outfile = open(STATE_FILE+".tmp","w") + except IOError, msg: + print "%s, are you root?" % (msg) + sys.exit(1) while tagfile.Step(): pkgname = tagfile.Section.get("Package") autoInst = tagfile.Section.get("Auto-Installed") diff --git a/debian/changelog b/debian/changelog index 5830b8ad5..679753cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -78,6 +78,9 @@ apt (0.7.25) UNRELEASED; urgency=low - bump policy to 3.8.3 as we have no outdated manpages anymore * debian/NEWS: - fix a typo in 0.7.24: Allready -> Already (Closes: #557674) + * cmdline/apt-mark: + - print an error if a new state file can't be created, + thanks Carl Chenet! (Closes: #521289) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 3f35be50ee4cb425b08139d4ccf5b54d527fe700 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 10 Dec 2009 21:45:31 +0100 Subject: merged -r 1918..1919 from lp:~donkult/apt/sid --- cmdline/apt-mark | 7 ++++--- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-mark b/cmdline/apt-mark index c44ce7038..3a818a3db 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -2,13 +2,14 @@ from optparse import OptionParser +import sys +import os.path + try: import apt_pkg except ImportError: print "Error importing apt_pkg, is python-apt installed?" - -import sys -import os.path + sys.exit(1) actions = { "markauto" : 1, "unmarkauto": 0 diff --git a/debian/changelog b/debian/changelog index 679753cfb..c4a6d0705 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,8 @@ apt (0.7.25) UNRELEASED; urgency=low * cmdline/apt-mark: - print an error if a new state file can't be created, thanks Carl Chenet! (Closes: #521289) + - print an error and exit if python-apt is not installed, + thanks Carl Chenet! (Closes: #521284) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From 9d20d8c8eb99ff85d082956813c3d624132d5399 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 10 Dec 2009 21:48:54 +0100 Subject: merged -r 1920..1922 from lp:~donkult/apt/sid --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 13 +++++++++++-- ftparchive/writer.cc | 21 +++++++++++++++++++-- ftparchive/writer.h | 1 + test/libapt/run-tests.sh | 10 ++++++++++ 5 files changed, 43 insertions(+), 4 deletions(-) create mode 100755 test/libapt/run-tests.sh (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c4a6d0705..0696541a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,8 @@ apt (0.7.25) UNRELEASED; urgency=low thanks Carl Chenet! (Closes: #521289) - print an error and exit if python-apt is not installed, thanks Carl Chenet! (Closes: #521284) + * ftparchive/writer.{cc,h}: + - add APT::FTPArchive::LongDescription to be able to disable them [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d4d77c68e..d47df957a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -15,7 +15,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>29 February 2004</date> + <date>17 August 2009</date> </refentryinfo> <refmeta> @@ -543,7 +543,16 @@ for i in Sections do Make the caching databases read only. Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem> </varlistentry> - + + <varlistentry><term><option>APT::FTPArchive::LongDescription</option></term> + <listitem><para> + This configuration option defaults to "<literal>true</literal>" and should only be set to + <literal>"false"</literal> if the Archive generated with &apt-ftparchive; also provides + <filename>Translation</filename> files. Note that it is currently not possible to create these + files with <command>apt-ftparchive</command>. + </para></listitem> + </varlistentry> + &apt-commonoptions; </variablelist> diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index 293e851f5..b2ebdca8a 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -308,6 +308,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); + LongDescription = _config->FindB("APT::FTPArchive::LongDescription",true); if (Db.Loaded() == false) DoContents = false; @@ -414,10 +415,18 @@ bool PackagesWriter::DoPackage(string FileName) NewFileName = FileName; if (PathPrefix.empty() == false) NewFileName = flCombine(PathPrefix,NewFileName); - + + /* Configuration says we don't want to include the long Description + in the package file - instead we want to ship a separated file */ + string desc; + if (LongDescription == false) { + desc = Tags.FindS("Description").append("\n"); + OverItem->FieldOverride["Description"] = desc.substr(0, desc.find('\n')).c_str(); + } + // This lists all the changes to the fields we are going to make. // (7 hardcoded + maintainer + suggests + end marker) - TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1]; + TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1+1]; unsigned int End = 0; SetTFRewriteData(Changes[End++], "Size", Size); @@ -429,6 +438,14 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Status", 0); SetTFRewriteData(Changes[End++], "Optional", 0); + string DescriptionMd5; + if (LongDescription == false) { + MD5Summation descmd5; + descmd5.Add(desc.c_str()); + DescriptionMd5 = descmd5.Result().Value(); + SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str()); + } + // Rewrite the maintainer field if necessary bool MaintFailed; string NewMaint = OverItem->SwapMaint(Tags.FindS("Maintainer"),MaintFailed); diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 6e161c752..e76438900 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -86,6 +86,7 @@ class PackagesWriter : public FTWScanner bool DoSHA256; bool NoOverride; bool DoContents; + bool LongDescription; // General options string PathPrefix; diff --git a/test/libapt/run-tests.sh b/test/libapt/run-tests.sh new file mode 100755 index 000000000..365bbe215 --- /dev/null +++ b/test/libapt/run-tests.sh @@ -0,0 +1,10 @@ +#!/bin/sh +echo "Compiling the tests ..." +make +echo "Running all testcases ..." +PATH=$(pwd)/../../build/bin +for testapp in $(/bin/ls ${PATH}/*_libapt_test) +do + echo -n "Testing with \033[1;35m$(/usr/bin/basename ${testapp})\033[0m ... " + LD_LIBRARY_PATH=${PATH} ${testapp} && echo "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m" +done -- cgit v1.2.3-70-g09d2 From a0895a74fe95997a5d75e5b54c95afb9594554f6 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 10 Dec 2009 21:59:49 +0100 Subject: merged -r 1923..1926 from lp:~donkult/apt/sid --- apt-pkg/deb/debsrcrecords.cc | 8 +- cmdline/apt-get.cc | 1 + debian/changelog | 3 + doc/po/es.po | 387 +++++++++++------- doc/po/it.po | 380 ++++++++++------- doc/po/pl.po | 380 ++++++++++------- doc/po/pt_BR.po | 383 ++++++++++------- po/apt-all.pot | 948 +++++++++++++++++++------------------------ po/ar.po | 279 +++++++------ po/ast.po | 291 +++++++------ po/bg.po | 287 +++++++------ po/bs.po | 279 +++++++------ po/ca.po | 291 +++++++------ po/cs.po | 286 +++++++------ po/cy.po | 288 +++++++------ po/da.po | 286 +++++++------ po/de.po | 291 +++++++------ po/dz.po | 288 +++++++------ po/el.po | 286 +++++++------ po/en_GB.po | 286 +++++++------ po/es.po | 286 +++++++------ po/eu.po | 286 +++++++------ po/fi.po | 286 +++++++------ po/fr.po | 300 ++++++++------ po/gl.po | 286 +++++++------ po/hu.po | 286 +++++++------ po/it.po | 162 ++++---- po/ja.po | 286 +++++++------ po/km.po | 288 +++++++------ po/ko.po | 286 +++++++------ po/ku.po | 286 +++++++------ po/lt.po | 279 +++++++------ po/mr.po | 286 +++++++------ po/nb.po | 286 +++++++------ po/ne.po | 288 +++++++------ po/nl.po | 286 +++++++------ po/nn.po | 288 +++++++------ po/pl.po | 291 +++++++------ po/pt.po | 286 +++++++------ po/pt_BR.po | 286 +++++++------ po/ro.po | 286 +++++++------ po/ru.po | 291 +++++++------ po/sk.po | 162 ++++---- po/sl.po | 288 +++++++------ po/sv.po | 286 +++++++------ po/th.po | 286 +++++++------ po/tl.po | 286 +++++++------ po/uk.po | 286 +++++++------ po/vi.po | 286 +++++++------ po/zh_CN.po | 162 ++++---- po/zh_TW.po | 286 +++++++------ 51 files changed, 8300 insertions(+), 6147 deletions(-) (limited to 'debian') diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 2f87c767b..bde10aa6d 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -135,9 +135,15 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List) string::size_type Tmp = F.Path.rfind('.',Pos); if (Tmp == string::npos) break; + if (F.Type == "tar") { + // source v3 has extension 'debian.tar.*' instead of 'diff.*' + if (string(F.Path, Tmp+1, Pos-Tmp) == "debian") + F.Type = "diff"; + break; + } F.Type = string(F.Path,Tmp+1,Pos-Tmp); - if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma") + if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar") { Pos = Tmp-1; continue; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 52e90fc64..f84c82d28 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2811,6 +2811,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, + {0,"debian-only","APT::Get::Diff-Only",0}, {0,"tar-only","APT::Get::Tar-Only",0}, {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, diff --git a/debian/changelog b/debian/changelog index 0696541a7..c75ea227e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,7 @@ apt (0.7.25) UNRELEASED; urgency=low - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) + - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors * buildlib/configure.mak, buildlib/config.{sub,guess}: @@ -85,6 +86,8 @@ apt (0.7.25) UNRELEASED; urgency=low thanks Carl Chenet! (Closes: #521284) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them + * apt-pkg/deb/debsrcrecords.cc: + - use "diff" filetype for .debian.tar.* files (Closes: #554898) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/po/es.po b/doc/po/es.po index 271998320..266f69c02 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2009-11-01 00:19+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+0100\n" "PO-Revision-Date: 2004-09-20 17:05+0000\n" "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" "Language-Team: <debian-l10n-spanish@lists.debian.org>\n" @@ -814,7 +814,7 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 -#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " "February 2004</date>" @@ -1494,7 +1494,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 #, fuzzy msgid "options" msgstr "Opciones" @@ -1759,7 +1759,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 #, fuzzy msgid "&apt-commonoptions;" @@ -1770,7 +1770,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 #, fuzzy msgid "Files" msgstr "Ficheros" @@ -1782,9 +1782,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -1831,7 +1831,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 #, fuzzy msgid "Diagnostics" @@ -2257,7 +2257,7 @@ 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><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@ -2362,6 +2362,14 @@ msgstr "" "apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " "el valor 100." +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-ftparchive.1.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"August 2009</date>" +msgstr "" + #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 #, fuzzy @@ -3259,28 +3267,44 @@ msgstr "" "Sólo busca en los nombres de paquetes, no en las descripciones largas. " "Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:547 +#, fuzzy +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "<option>--all-versions</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +msgid "" +"This configuration option defaults to \"<literal>true</literal>\" and should " +"only be set to <literal>\"false\"</literal> if the Archive generated with " +"&apt-ftparchive; also provides <filename>Translation</filename> files. Note " +"that it is currently not possible to create these files with <command>apt-" +"ftparchive</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:567 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:563 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:577 #, fuzzy msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " @@ -5704,7 +5728,7 @@ msgstr "" "Nota: Squid 2.0.2 no soporta ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 apt.conf.5.xml:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 #, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " @@ -5745,22 +5769,32 @@ msgid "" "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +msgid "" +"<literal>Acquire::http::User-Agent</literal> can be used to set a different " +"User-Agent for the http download method as some proxies allow access for " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:281 +#: apt.conf.5.xml:286 #, fuzzy msgid "https" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -5781,13 +5815,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 #, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 #, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " @@ -5819,7 +5853,7 @@ msgstr "" "de la URI correspondiente." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 #, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " @@ -5836,7 +5870,7 @@ msgstr "" "fichero de configuración de muestra para ver ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 #, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" @@ -5851,7 +5885,7 @@ msgstr "" "eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 #, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " @@ -5867,19 +5901,19 @@ msgstr "" "la mayoría de los servidores FTP no soportan RFC2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 #, fuzzy msgid "cdrom" msgstr "apt-cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 #, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " @@ -5899,12 +5933,12 @@ msgstr "" "antiguas). Respecto a la sintaxis se pone" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -5912,18 +5946,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -5935,19 +5969,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -5964,13 +5998,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -5985,7 +6019,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -5994,6 +6028,53 @@ msgid "" "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +msgid "" +"The Languages subsection controls which <filename>Translation</filename> " +"files are downloaded and in which order APT tries to display the Description-" +"Translations. APT will try to display the first available Description for " +"the Language which is listed at first. Languages can be defined with their " +"short or long Languagecodes. Note that not all archives provide " +"<filename>Translation</filename> files for every Language - especially the " +"long Languagecodes are rare, so please inform you which ones are available " +"before you set here impossible values." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> +#: apt.conf.5.xml:413 +#, no-wrap +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +msgid "" +"The default list includes \"environment\" and \"en\". " +"\"<literal>environment</literal>\" has a special meaning here: It will be " +"replaced at runtime with the languagecodes extracted from the " +"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +"that these codes are not included twice in the list. If " +"<literal>LC_MESSAGES</literal> is set to \"C\" only the " +"<filename>Translation-en</filename> file (if available) will be used. To " +"force apt to use no Translation file use the setting <literal>Acquire::" +"Languages=none</literal>. \"<literal>none</literal>\" is another special " +"meaning code which will stop the search for a fitting <filename>Translation</" +"filename> file. This can be used by the system administrator to let APT " +"know that it should download also this files without actually use them if " +"not the environment specifies this languages. So the following example " +"configuration will result in the order \"en, de\" in an english and in \"de, " +"en\" in a german localization. Note that \"fr\" is downloaded, but not used " +"if APT is not used in a french localization, in such an environment the " +"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 #, fuzzy @@ -6005,13 +6086,13 @@ msgstr "" "paquetes y los manejadores de URI." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 #, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 #, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " @@ -6032,7 +6113,7 @@ msgstr "" "filename> o <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 #, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " @@ -6054,7 +6135,7 @@ msgstr "" "literal> el directorio predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 #, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " @@ -6071,7 +6152,7 @@ msgstr "" "envar>)." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 #, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " @@ -6083,7 +6164,7 @@ msgstr "" "esto se carga el fichero principal de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 #, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" @@ -6101,7 +6182,7 @@ msgstr "" "respectivos programas." #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -6114,13 +6195,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 #, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 #, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " @@ -6132,13 +6213,13 @@ msgstr "" "la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 #, fuzzy msgid "Clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 #, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " @@ -6156,7 +6237,7 @@ msgstr "" "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -6166,13 +6247,13 @@ msgstr "" "ordenes cuando se ejecuta en la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:489 #, fuzzy msgid "Updateoptions" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 #, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " @@ -6182,13 +6263,13 @@ msgstr "" "ordenes cuando se ejecuta en la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:494 #, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 #, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " @@ -6198,13 +6279,13 @@ msgstr "" "continuar. Por omisión sólo pregunta en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:501 #, fuzzy msgid "How APT calls dpkg" msgstr "Como APT llama a dpkg" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 #, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " @@ -6214,7 +6295,7 @@ msgstr "" "encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 #, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " @@ -6226,19 +6307,19 @@ msgstr "" "como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 #, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 #, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " @@ -6252,13 +6333,13 @@ msgstr "" "si alguna falla APT abortará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 #, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 #, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " @@ -6274,7 +6355,7 @@ msgstr "" "todos los .deb que va ha instalar por la entrada estándar, uno por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 #, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " @@ -6290,13 +6371,13 @@ msgstr "" "dada a <literal>Pre-Install-Pkgs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 #, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 #, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" @@ -6306,13 +6387,13 @@ msgstr "" "omisión es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 #, fuzzy msgid "Build-options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 #, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " @@ -6323,12 +6404,12 @@ msgstr "" "binarios." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -6343,7 +6424,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -6353,7 +6434,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -6367,12 +6448,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -6384,12 +6465,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -6405,12 +6486,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -6421,12 +6502,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -6436,12 +6517,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -6453,12 +6534,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -6470,7 +6551,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -6484,12 +6565,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -6498,13 +6579,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 #, fuzzy msgid "Debug options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -6515,7 +6596,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -6523,7 +6604,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -6531,7 +6612,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -6541,120 +6622,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:646 +#: apt.conf.5.xml:674 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 #, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 #, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 #, fuzzy msgid "<literal>Debug::Acquire::http</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 #, fuzzy msgid "<literal>Debug::Acquire::https</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 #, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 #, fuzzy msgid "<literal>Debug::aptcdrom</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:755 #, fuzzy msgid "<literal>Debug::BuildDeps</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 #, fuzzy msgid "<literal>Debug::Hashes</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:747 +#: apt.conf.5.xml:775 #, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -6662,99 +6743,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 #, fuzzy msgid "<literal>Debug::NoLocking</literal>" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:797 #, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:808 #, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:811 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:818 #, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:821 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:829 #, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:833 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:812 +#: apt.conf.5.xml:840 #, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "La línea <literal>Archive:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:816 +#: apt.conf.5.xml:844 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -6764,12 +6845,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -6786,96 +6867,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 #, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 #, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:929 #, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" msgstr "La línea <literal>Origin:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 #, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "La línea <literal>Package:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 #, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" msgstr "La línea <literal>Label:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -6883,20 +6964,20 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 #, fuzzy msgid "<literal>Debug::sourceList</literal>" msgstr "La línea <literal>Version:</literal> " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 #, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " @@ -6906,14 +6987,14 @@ msgstr "" "los valores predeterminados para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 #, fuzzy msgid "&file-aptconf;" msgstr "apt-cdrom" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache; &apt-conf;" @@ -9827,7 +9908,8 @@ msgstr "" #~ " \n" #~ " <VarListEntry><term><option/-o/</><term><option/--option/</>\n" #~ " <ListItem><Para>\n" -#~ " Set a Configuration Option; This will set an arbitary configuration \n" +#~ " Set a Configuration Option; This will set an arbitary " +#~ "configuration \n" #~ " option. The syntax is <option>-o Foo::Bar=bar</>.\n" #~ " </VarListEntry>\n" #~ msgstr "" @@ -9846,7 +9928,8 @@ msgstr "" #~ " <ListItem><Para>\n" #~ " Especifica el fichero de configuración a usar.\n" #~ " El programa leerá el fichero de configuración por omisión y luego\n" -#~ " este otro. Lea &apt-conf; para más información acerca de la sintaxis.\n" +#~ " este otro. Lea &apt-conf; para más información acerca de la " +#~ "sintaxis.\n" #~ " </VarListEntry>\n" #~ " \n" #~ " <VarListEntry><term><option/-o/</><term><option/--option/</>\n" diff --git a/doc/po/it.po b/doc/po/it.po index 2722ca562..37cf5d078 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-10-29 14:19+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -752,7 +752,7 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 -#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " "February 2004</date>" @@ -1203,7 +1203,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "" @@ -1397,14 +1397,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1415,9 +1415,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1429,7 +1429,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1729,7 +1729,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1814,6 +1814,14 @@ msgid "" "decimal 100 on error." msgstr "" +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-ftparchive.1.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"August 2009</date>" +msgstr "" + #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 msgid "apt-ftparchive" @@ -2672,27 +2680,42 @@ msgid "" "FTPArchive::ReadOnlyDB</literal>." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:547 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +msgid "" +"This configuration option defaults to \"<literal>true</literal>\" and should " +"only be set to <literal>\"false\"</literal> if the Archive generated with " +"&apt-ftparchive; also provides <filename>Translation</filename> files. Note " +"that it is currently not possible to create these files with <command>apt-" +"ftparchive</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:567 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:563 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:577 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4586,7 +4609,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 apt.conf.5.xml:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4615,21 +4638,31 @@ msgid "" "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +msgid "" +"<literal>Acquire::http::User-Agent</literal> can be used to set a different " +"User-Agent for the http download method as some proxies allow access for " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4650,12 +4683,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4674,7 +4707,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4684,7 +4717,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4693,7 +4726,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4703,18 +4736,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4727,12 +4760,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4740,18 +4773,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4763,19 +4796,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4792,13 +4825,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4813,7 +4846,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4822,6 +4855,53 @@ msgid "" "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +msgid "" +"The Languages subsection controls which <filename>Translation</filename> " +"files are downloaded and in which order APT tries to display the Description-" +"Translations. APT will try to display the first available Description for " +"the Language which is listed at first. Languages can be defined with their " +"short or long Languagecodes. Note that not all archives provide " +"<filename>Translation</filename> files for every Language - especially the " +"long Languagecodes are rare, so please inform you which ones are available " +"before you set here impossible values." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> +#: apt.conf.5.xml:413 +#, no-wrap +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +msgid "" +"The default list includes \"environment\" and \"en\". " +"\"<literal>environment</literal>\" has a special meaning here: It will be " +"replaced at runtime with the languagecodes extracted from the " +"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +"that these codes are not included twice in the list. If " +"<literal>LC_MESSAGES</literal> is set to \"C\" only the " +"<filename>Translation-en</filename> file (if available) will be used. To " +"force apt to use no Translation file use the setting <literal>Acquire::" +"Languages=none</literal>. \"<literal>none</literal>\" is another special " +"meaning code which will stop the search for a fitting <filename>Translation</" +"filename> file. This can be used by the system administrator to let APT " +"know that it should download also this files without actually use them if " +"not the environment specifies this languages. So the following example " +"configuration will result in the order \"en, de\" in an english and in \"de, " +"en\" in a german localization. Note that \"fr\" is downloaded, but not used " +"if APT is not used in a french localization, in such an environment the " +"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@ -4830,12 +4910,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4847,7 +4927,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4860,7 +4940,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4870,7 +4950,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4878,7 +4958,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4889,7 +4969,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4902,13 +4982,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 #, fuzzy msgid "APT in DSelect" msgstr "DSelect" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4916,12 +4996,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -4932,50 +5012,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4983,17 +5063,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5002,12 +5082,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5017,7 +5097,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5027,36 +5107,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5071,7 +5151,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5081,7 +5161,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5095,12 +5175,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5112,12 +5192,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5133,12 +5213,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5149,12 +5229,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5164,12 +5244,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5181,12 +5261,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5198,7 +5278,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5212,12 +5292,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5226,12 +5306,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5242,7 +5322,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5250,7 +5330,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5258,7 +5338,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5268,111 +5348,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:646 +#: apt.conf.5.xml:674 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5380,93 +5460,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:811 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:821 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:829 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:833 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:812 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:816 +#: apt.conf.5.xml:844 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5476,12 +5556,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5498,91 +5578,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5590,32 +5670,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/pl.po b/doc/po/pl.po index e3363ba7f..27b7a8a7b 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2009-10-29 14:19+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -752,7 +752,7 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 -#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " "February 2004</date>" @@ -1203,7 +1203,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 #, fuzzy msgid "options" msgstr "Kolejne kroki" @@ -1398,14 +1398,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1416,9 +1416,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1430,7 +1430,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1732,7 +1732,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1817,6 +1817,14 @@ msgid "" "decimal 100 on error." msgstr "" +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-ftparchive.1.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"August 2009</date>" +msgstr "" + #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 msgid "apt-ftparchive" @@ -2678,27 +2686,42 @@ msgid "" "FTPArchive::ReadOnlyDB</literal>." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:547 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +msgid "" +"This configuration option defaults to \"<literal>true</literal>\" and should " +"only be set to <literal>\"false\"</literal> if the Archive generated with " +"&apt-ftparchive; also provides <filename>Translation</filename> files. Note " +"that it is currently not possible to create these files with <command>apt-" +"ftparchive</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:567 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:563 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:577 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4588,7 +4611,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 apt.conf.5.xml:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4617,21 +4640,31 @@ msgid "" "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +msgid "" +"<literal>Acquire::http::User-Agent</literal> can be used to set a different " +"User-Agent for the http download method as some proxies allow access for " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4652,12 +4685,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4676,7 +4709,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4686,7 +4719,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4695,7 +4728,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4705,18 +4738,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4729,12 +4762,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4742,18 +4775,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4765,19 +4798,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4794,13 +4827,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4815,7 +4848,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4824,6 +4857,53 @@ msgid "" "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +msgid "" +"The Languages subsection controls which <filename>Translation</filename> " +"files are downloaded and in which order APT tries to display the Description-" +"Translations. APT will try to display the first available Description for " +"the Language which is listed at first. Languages can be defined with their " +"short or long Languagecodes. Note that not all archives provide " +"<filename>Translation</filename> files for every Language - especially the " +"long Languagecodes are rare, so please inform you which ones are available " +"before you set here impossible values." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> +#: apt.conf.5.xml:413 +#, no-wrap +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +msgid "" +"The default list includes \"environment\" and \"en\". " +"\"<literal>environment</literal>\" has a special meaning here: It will be " +"replaced at runtime with the languagecodes extracted from the " +"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +"that these codes are not included twice in the list. If " +"<literal>LC_MESSAGES</literal> is set to \"C\" only the " +"<filename>Translation-en</filename> file (if available) will be used. To " +"force apt to use no Translation file use the setting <literal>Acquire::" +"Languages=none</literal>. \"<literal>none</literal>\" is another special " +"meaning code which will stop the search for a fitting <filename>Translation</" +"filename> file. This can be used by the system administrator to let APT " +"know that it should download also this files without actually use them if " +"not the environment specifies this languages. So the following example " +"configuration will result in the order \"en, de\" in an english and in \"de, " +"en\" in a german localization. Note that \"fr\" is downloaded, but not used " +"if APT is not used in a french localization, in such an environment the " +"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@ -4832,12 +4912,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4849,7 +4929,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4862,7 +4942,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4872,7 +4952,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4880,7 +4960,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4891,7 +4971,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4904,12 +4984,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4917,12 +4997,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -4933,50 +5013,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -4984,17 +5064,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5003,12 +5083,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5018,7 +5098,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5028,36 +5108,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5072,7 +5152,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5082,7 +5162,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5096,12 +5176,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5113,12 +5193,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5134,12 +5214,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5150,12 +5230,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5165,12 +5245,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5182,12 +5262,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5199,7 +5279,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5213,12 +5293,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5227,12 +5307,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5243,7 +5323,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5251,7 +5331,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5259,7 +5339,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5269,111 +5349,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:646 +#: apt.conf.5.xml:674 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 msgid "<literal>Debug::Acquire::cdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 msgid "<literal>Debug::Acquire::ftp</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 msgid "<literal>Debug::Acquire::http</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 msgid "<literal>Debug::Acquire::https</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 msgid "<literal>Debug::Acquire::gpgv</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 msgid "<literal>Debug::aptcdrom</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:720 +#: apt.conf.5.xml:748 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:755 msgid "<literal>Debug::BuildDeps</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 msgid "<literal>Debug::Hashes</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:740 +#: apt.conf.5.xml:768 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:747 +#: apt.conf.5.xml:775 msgid "<literal>Debug::IdentCDROM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:750 +#: apt.conf.5.xml:778 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5381,93 +5461,93 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 msgid "<literal>Debug::NoLocking</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:761 +#: apt.conf.5.xml:789 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:797 msgid "<literal>Debug::pkgAcquire</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:773 +#: apt.conf.5.xml:801 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:808 msgid "<literal>Debug::pkgAcquire::Auth</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:783 +#: apt.conf.5.xml:811 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:818 msgid "<literal>Debug::pkgAcquire::Diffs</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:793 +#: apt.conf.5.xml:821 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:829 msgid "<literal>Debug::pkgAcquire::RRed</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:805 +#: apt.conf.5.xml:833 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:812 +#: apt.conf.5.xml:840 msgid "<literal>Debug::pkgAcquire::Worker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:816 +#: apt.conf.5.xml:844 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5477,12 +5557,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5499,91 +5579,91 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 msgid "<literal>Debug::pkgInitConfig</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 msgid "<literal>Debug::pkgDPkgPM</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:883 +#: apt.conf.5.xml:911 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:929 msgid "<literal>Debug::pkgOrderList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:905 +#: apt.conf.5.xml:933 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 msgid "<literal>Debug::pkgPackageManager</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 msgid "<literal>Debug::pkgPolicy</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5591,32 +5671,32 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 msgid "<literal>Debug::sourceList</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index e6de8f139..ea410fc4d 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2009-10-29 14:19+0100\n" +"POT-Creation-Date: 2009-11-27 00:05+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -795,7 +795,7 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 -#: apt-ftparchive.1.xml:13 apt-sortpkgs.1.xml:13 sources.list.5.xml:13 +#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " "February 2004</date>" @@ -1249,7 +1249,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 #: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 -#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:456 apt.conf.5.xml:478 +#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:484 apt.conf.5.xml:506 msgid "options" msgstr "" @@ -1443,14 +1443,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:556 apt-get.8.xml:554 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 -#: apt.conf.5.xml:988 apt_preferences.5.xml:615 +#: apt.conf.5.xml:1017 apt_preferences.5.xml:615 msgid "Files" msgstr "" @@ -1461,9 +1461,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:572 apt-get.8.xml:569 #: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:994 apt_preferences.5.xml:622 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1023 apt_preferences.5.xml:622 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -1476,7 +1476,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:576 apt-get.8.xml:575 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1777,7 +1777,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:564 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:573 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@ -1866,6 +1866,14 @@ msgid "" "decimal 100 on error." msgstr "" +#. The last update date +#. type: Content of: <refentry><refentryinfo> +#: apt-ftparchive.1.xml:13 +msgid "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"August 2009</date>" +msgstr "" + #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 msgid "apt-ftparchive" @@ -2725,28 +2733,43 @@ msgid "" "FTPArchive::ReadOnlyDB</literal>." msgstr "" +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:547 +msgid "<option>APT::FTPArchive::LongDescription</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +msgid "" +"This configuration option defaults to \"<literal>true</literal>\" and should " +"only be set to <literal>\"false\"</literal> if the Archive generated with " +"&apt-ftparchive; also provides <filename>Translation</filename> files. Note " +"that it is currently not possible to create these files with <command>apt-" +"ftparchive</command>." +msgstr "" + #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:552 apt.conf.5.xml:982 apt_preferences.5.xml:462 +#: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:558 +#: apt-ftparchive.1.xml:567 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:554 +#: apt-ftparchive.1.xml:563 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:568 +#: apt-ftparchive.1.xml:577 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4637,7 +4660,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:264 apt.conf.5.xml:321 +#: apt.conf.5.xml:264 apt.conf.5.xml:328 msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " @@ -4666,21 +4689,31 @@ msgid "" "multiple servers at the same time.)" msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:280 +msgid "" +"<literal>Acquire::http::User-Agent</literal> can be used to set a different " +"User-Agent for the http download method as some proxies allow access for " +"clients only if the client uses a known identifier." +msgstr "" + #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:281 +#: apt.conf.5.xml:286 msgid "https" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:282 +#: apt.conf.5.xml:287 msgid "" -"HTTPS URIs. Cache-control and proxy options are the same as for " -"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is " +"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy " +"options are the same as for <literal>http</literal> method and will also " +"default to the options from the <literal>http</literal> method if they are " +"not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:286 +#: apt.conf.5.xml:293 msgid "" "<literal>CaInfo</literal> suboption specifies place of file that holds info " "about trusted certificates. <literal><host>::CaInfo</literal> is " @@ -4701,12 +4734,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:304 sources.list.5.xml:150 +#: apt.conf.5.xml:311 sources.list.5.xml:150 msgid "ftp" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:305 +#: apt.conf.5.xml:312 msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -4725,7 +4758,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:324 +#: apt.conf.5.xml:331 msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -4735,7 +4768,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:331 +#: apt.conf.5.xml:338 msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " @@ -4744,7 +4777,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:336 +#: apt.conf.5.xml:343 msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -4754,18 +4787,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:343 sources.list.5.xml:132 +#: apt.conf.5.xml:350 sources.list.5.xml:132 msgid "cdrom" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:349 +#: apt.conf.5.xml:356 #, no-wrap msgid "/cdrom/::Mount \"foo\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:344 +#: apt.conf.5.xml:351 msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -4778,12 +4811,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:354 +#: apt.conf.5.xml:361 msgid "gpgv" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:355 +#: apt.conf.5.xml:362 msgid "" "GPGV URIs; the only option for GPGV URIs is the option to pass additional " "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " @@ -4791,18 +4824,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> -#: apt.conf.5.xml:360 +#: apt.conf.5.xml:367 msgid "CompressionTypes" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:366 +#: apt.conf.5.xml:373 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:361 +#: apt.conf.5.xml:368 msgid "" "List of compression types which are understood by the acquire methods. " "Files like <filename>Packages</filename> can be available in various " @@ -4814,19 +4847,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:371 +#: apt.conf.5.xml:378 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> -#: apt.conf.5.xml:374 +#: apt.conf.5.xml:381 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:367 +#: apt.conf.5.xml:374 msgid "" "Also the <literal>Order</literal> subgroup can be used to define in which " "order the acquire system will try to download the compressed files. The " @@ -4843,13 +4876,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:378 +#: apt.conf.5.xml:385 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:376 +#: apt.conf.5.xml:383 msgid "" "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</" "replaceable></literal> will be checked: If this setting exists the method " @@ -4864,7 +4897,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:383 +#: apt.conf.5.xml:390 msgid "" "While it is possible to add an empty compression type to the order list, but " "APT in its current version doesn't understand it correctly and will display " @@ -4873,6 +4906,53 @@ msgid "" "prefer uncompressed files to support the usage of local mirrors." msgstr "" +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> +#: apt.conf.5.xml:396 +msgid "Languages" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:397 +msgid "" +"The Languages subsection controls which <filename>Translation</filename> " +"files are downloaded and in which order APT tries to display the Description-" +"Translations. APT will try to display the first available Description for " +"the Language which is listed at first. Languages can be defined with their " +"short or long Languagecodes. Note that not all archives provide " +"<filename>Translation</filename> files for every Language - especially the " +"long Languagecodes are rare, so please inform you which ones are available " +"before you set here impossible values." +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> +#: apt.conf.5.xml:413 +#, no-wrap +msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" +msgstr "" + +#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> +#: apt.conf.5.xml:403 +msgid "" +"The default list includes \"environment\" and \"en\". " +"\"<literal>environment</literal>\" has a special meaning here: It will be " +"replaced at runtime with the languagecodes extracted from the " +"<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +"that these codes are not included twice in the list. If " +"<literal>LC_MESSAGES</literal> is set to \"C\" only the " +"<filename>Translation-en</filename> file (if available) will be used. To " +"force apt to use no Translation file use the setting <literal>Acquire::" +"Languages=none</literal>. \"<literal>none</literal>\" is another special " +"meaning code which will stop the search for a fitting <filename>Translation</" +"filename> file. This can be used by the system administrator to let APT " +"know that it should download also this files without actually use them if " +"not the environment specifies this languages. So the following example " +"configuration will result in the order \"en, de\" in an english and in \"de, " +"en\" in a german localization. Note that \"fr\" is downloaded, but not used " +"if APT is not used in a french localization, in such an environment the " +"order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" +"\"/>" +msgstr "" + #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:217 msgid "" @@ -4881,12 +4961,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:392 +#: apt.conf.5.xml:420 msgid "Directories" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:394 +#: apt.conf.5.xml:422 msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -4898,7 +4978,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:401 +#: apt.conf.5.xml:429 msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -4911,7 +4991,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:410 +#: apt.conf.5.xml:438 msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -4921,7 +5001,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:416 +#: apt.conf.5.xml:444 msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " @@ -4929,7 +5009,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:420 +#: apt.conf.5.xml:448 msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -4940,7 +5020,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:428 +#: apt.conf.5.xml:456 msgid "" "The configuration item <literal>RootDir</literal> has a special meaning. If " "set, all paths in <literal>Dir::</literal> will be relative to " @@ -4953,12 +5033,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:441 +#: apt.conf.5.xml:469 msgid "APT in DSelect" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:443 +#: apt.conf.5.xml:471 msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " @@ -4966,12 +5046,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:447 +#: apt.conf.5.xml:475 msgid "Clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:448 +#: apt.conf.5.xml:476 msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -4982,50 +5062,50 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:457 +#: apt.conf.5.xml:485 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:461 +#: apt.conf.5.xml:489 msgid "Updateoptions" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:462 +#: apt.conf.5.xml:490 msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:466 +#: apt.conf.5.xml:494 msgid "PromptAfterUpdate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:467 +#: apt.conf.5.xml:495 msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:473 +#: apt.conf.5.xml:501 msgid "How APT calls dpkg" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:474 +#: apt.conf.5.xml:502 msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:479 +#: apt.conf.5.xml:507 msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " @@ -5033,17 +5113,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Pre-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:484 +#: apt.conf.5.xml:512 msgid "Post-Invoke" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:485 +#: apt.conf.5.xml:513 msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5052,12 +5132,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:491 +#: apt.conf.5.xml:519 msgid "Pre-Install-Pkgs" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:492 +#: apt.conf.5.xml:520 msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -5067,7 +5147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:498 +#: apt.conf.5.xml:526 msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -5077,36 +5157,36 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:505 +#: apt.conf.5.xml:533 msgid "Run-Directory" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:506 +#: apt.conf.5.xml:534 msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:510 +#: apt.conf.5.xml:538 msgid "Build-options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:511 +#: apt.conf.5.xml:539 msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt.conf.5.xml:516 +#: apt.conf.5.xml:544 msgid "dpkg trigger usage (and related options)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:517 +#: apt.conf.5.xml:545 msgid "" "APT can call dpkg in a way so it can make aggressive use of triggers over " "multiply calls of dpkg. Without further options dpkg will use triggers only " @@ -5121,7 +5201,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> -#: apt.conf.5.xml:532 +#: apt.conf.5.xml:560 #, no-wrap msgid "" "DPkg::NoTriggers \"true\";\n" @@ -5131,7 +5211,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt.conf.5.xml:526 +#: apt.conf.5.xml:554 msgid "" "Note that it is not guaranteed that APT will support these options or that " "these options will not cause (big) trouble in the future. If you have " @@ -5145,12 +5225,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:538 +#: apt.conf.5.xml:566 msgid "DPkg::NoTriggers" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:539 +#: apt.conf.5.xml:567 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 " @@ -5162,12 +5242,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:546 +#: apt.conf.5.xml:574 msgid "PackageManager::Configure" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:547 +#: apt.conf.5.xml:575 msgid "" "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" " "and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default " @@ -5183,12 +5263,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:557 +#: apt.conf.5.xml:585 msgid "DPkg::ConfigurePending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:558 +#: apt.conf.5.xml:586 msgid "" "If this option is set apt will call <command>dpkg --configure --pending</" "command> to let dpkg handle all required configurations and triggers. This " @@ -5199,12 +5279,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:564 +#: apt.conf.5.xml:592 msgid "DPkg::TriggersPending" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:565 +#: apt.conf.5.xml:593 msgid "" "Useful for <literal>smart</literal> configuration as a package which has " "pending triggers is not considered as <literal>installed</literal> and dpkg " @@ -5214,12 +5294,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:570 +#: apt.conf.5.xml:598 msgid "PackageManager::UnpackAll" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:571 +#: apt.conf.5.xml:599 msgid "" "As the configuration can be deferred to be done at the end by dpkg it can be " "tried to order the unpack series only by critical needs, e.g. by Pre-" @@ -5231,12 +5311,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt.conf.5.xml:578 +#: apt.conf.5.xml:606 msgid "OrderList::Score::Immediate" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> -#: apt.conf.5.xml:586 +#: apt.conf.5.xml:614 #, no-wrap msgid "" "OrderList::Score {\n" @@ -5248,7 +5328,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:579 +#: apt.conf.5.xml:607 msgid "" "Essential packages (and there dependencies) should be configured immediately " "after unpacking. It will be a good idea to do this quite early in the " @@ -5262,12 +5342,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:599 +#: apt.conf.5.xml:627 msgid "Periodic and Archives options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:600 +#: apt.conf.5.xml:628 msgid "" "<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups " "of options configure behavior of apt periodic updates, which is done by " @@ -5276,12 +5356,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt.conf.5.xml:608 +#: apt.conf.5.xml:636 msgid "Debug options" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:610 +#: apt.conf.5.xml:638 msgid "" "Enabling options in the <literal>Debug::</literal> section will cause " "debugging information to be sent to the standard error stream of the program " @@ -5292,7 +5372,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:621 +#: apt.conf.5.xml:649 msgid "" "<literal>Debug::pkgProblemResolver</literal> enables output about the " "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" @@ -5300,7 +5380,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:629 +#: apt.conf.5.xml:657 msgid "" "<literal>Debug::NoLocking</literal> disables all file locking. This can be " "used to run some operations (for instance, <literal>apt-get -s install</" @@ -5308,7 +5388,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> -#: apt.conf.5.xml:638 +#: apt.conf.5.xml:666 msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." @@ -5318,120 +5398,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:646 +#: apt.conf.5.xml:674 msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:656 +#: apt.conf.5.xml:684 msgid "A full list of debugging options to apt follows." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:661 +#: apt.conf.5.xml:689 #, 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:665 +#: apt.conf.5.xml:693 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:672 +#: apt.conf.5.xml:700 #, 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:676 +#: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:683 +#: apt.conf.5.xml:711 #, 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:687 +#: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:694 +#: apt.conf.5.xml:722 #, 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:698 +#: apt.conf.5.xml:726 msgid "Print information related to downloading packages using HTTPS." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:705 +#: apt.conf.5.xml:733 #, 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:709 +#: apt.conf.5.xml:737 msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:716 +#: apt.conf.5.xml:744 #, 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:720 +#: apt.conf.5.xml:748 msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:727 +#: apt.conf.5.xml:755 #, 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:730 +#: apt.conf.5.xml:758 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:737 +#: apt.conf.5.xml:765 #, 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:740 +#: apt.conf.5.xml:768 msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:747 +#: apt.conf.5.xml:775 #, 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:750 +#: apt.conf.5.xml:778 msgid "" "Do not include information from <literal>statfs</literal>, namely the number " "of used and free blocks on the CD-ROM filesystem, when generating an ID for " @@ -5439,99 +5519,99 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:758 +#: apt.conf.5.xml:786 #, 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:761 +#: apt.conf.5.xml:789 msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:769 +#: apt.conf.5.xml:797 #, 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:773 +#: apt.conf.5.xml:801 msgid "Log when items are added to or removed from the global download queue." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:780 +#: apt.conf.5.xml:808 #, 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:783 +#: apt.conf.5.xml:811 msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:790 +#: apt.conf.5.xml:818 #, 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:793 +#: apt.conf.5.xml:821 msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:801 +#: apt.conf.5.xml:829 #, 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:805 +#: apt.conf.5.xml:833 msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:812 +#: apt.conf.5.xml:840 #, 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:816 +#: apt.conf.5.xml:844 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:823 +#: apt.conf.5.xml:851 msgid "<literal>Debug::pkgAutoRemove</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:827 +#: apt.conf.5.xml:855 msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:834 +#: apt.conf.5.xml:862 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:837 +#: apt.conf.5.xml:865 msgid "" "Generate debug messages describing which packages are being automatically " "installed to resolve dependencies. This corresponds to the initial auto-" @@ -5541,12 +5621,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:848 +#: apt.conf.5.xml:876 msgid "<literal>Debug::pkgDepCache::Marker</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:851 +#: apt.conf.5.xml:879 msgid "" "Generate debug messages describing which package is marked as keep/install/" "remove while the ProblemResolver does his work. Each addition or deletion " @@ -5563,96 +5643,96 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:870 +#: apt.conf.5.xml:898 #, 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:873 +#: apt.conf.5.xml:901 msgid "Dump the default configuration to standard error on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:880 +#: apt.conf.5.xml:908 #, 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:883 +#: apt.conf.5.xml:911 msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:891 +#: apt.conf.5.xml:919 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:894 +#: apt.conf.5.xml:922 msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:901 +#: apt.conf.5.xml:929 #, 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:905 +#: apt.conf.5.xml:933 msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:913 +#: apt.conf.5.xml:941 #, 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:917 +#: apt.conf.5.xml:945 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:924 +#: apt.conf.5.xml:952 #, 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:928 +#: apt.conf.5.xml:956 msgid "Output the priority of each package list on startup." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:934 +#: apt.conf.5.xml:962 msgid "<literal>Debug::pkgProblemResolver</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:938 +#: apt.conf.5.xml:966 msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:946 +#: apt.conf.5.xml:974 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt.conf.5.xml:949 +#: apt.conf.5.xml:977 msgid "" "Display a list of all installed packages with their calculated score used by " "the pkgProblemResolver. The description of the package is the same as " @@ -5660,33 +5740,33 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt.conf.5.xml:957 +#: apt.conf.5.xml:985 #, 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:961 +#: apt.conf.5.xml:989 msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:983 +#: apt.conf.5.xml:1012 msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt.conf.5.xml:990 +#: apt.conf.5.xml:1019 msgid "&file-aptconf;" msgstr "" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> -#: apt.conf.5.xml:995 +#: apt.conf.5.xml:1024 #, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -8449,7 +8529,8 @@ msgstr "" #~ " \n" #~ " <VarListEntry><term><option/-o/</><term><option/--option/</>\n" #~ " <ListItem><Para>\n" -#~ " Set a Configuration Option; This will set an arbitary configuration \n" +#~ " Set a Configuration Option; This will set an arbitary " +#~ "configuration \n" #~ " option. The syntax is <option>-o Foo::Bar=bar</>.\n" #~ " </VarListEntry>\n" #~ msgstr "" diff --git a/po/apt-all.pot b/po/apt-all.pot index f20aa2241..83c55c9d4 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-22 21:18+0200\n" +"POT-Creation-Date: 2009-12-10 16:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,7 +21,7 @@ msgid "Package %s version %s has an unmet dep:\n" msgstr "" #: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 -#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022 +#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 #: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575 #, c-format msgid "Unable to locate package %s" @@ -91,7 +91,7 @@ msgstr "" msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 #, c-format msgid "Package file %s is out of sync." msgstr "" @@ -149,14 +149,14 @@ msgstr "" msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" -#: cmdline/apt-cache.cc:1726 +#: cmdline/apt-cache.cc:1725 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -179,8 +179,8 @@ msgid "" " show - Show a readable record for the package\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" -" pkgnames - List the names of all packages\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -195,15 +195,15 @@ msgid "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" msgstr "" -#: cmdline/apt-cdrom.cc:78 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +#: cmdline/apt-cdrom.cc:77 +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:93 +#: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:117 +#: cmdline/apt-cdrom.cc:114 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -246,8 +246,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 -#: apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 #, c-format msgid "Unable to write to %s" msgstr "" @@ -546,221 +545,221 @@ msgstr "" msgid "Failed to rename %s to %s" msgstr "" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 #, c-format msgid "Regex compilation error - %s" msgstr "" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr "" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:382 msgid "The following NEW packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:408 msgid "The following packages will be REMOVED:" msgstr "" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:430 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:492 msgid "The following held packages will be changed:" msgstr "" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:545 #, c-format msgid "%s (due to %s) " msgstr "" -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:553 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:584 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "" -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:588 #, c-format msgid "%lu reinstalled, " msgstr "" -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:590 #, c-format msgid "%lu downgraded, " msgstr "" -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:592 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "" -#: cmdline/apt-get.cc:593 +#: cmdline/apt-get.cc:596 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:669 msgid "Correcting dependencies..." msgstr "" -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:672 msgid " failed." msgstr "" -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:675 msgid "Unable to correct dependencies" msgstr "" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:678 msgid "Unable to minimize the upgrade set" msgstr "" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:680 msgid " Done" msgstr "" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:684 msgid "You might want to run `apt-get -f install' to correct these." msgstr "" -#: cmdline/apt-get.cc:685 +#: cmdline/apt-get.cc:687 msgid "Unmet dependencies. Try using -f." msgstr "" -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:712 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:716 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:723 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:725 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 msgid "There are problems and -y was used without --force-yes" msgstr "" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:775 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:784 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:793 +#: cmdline/apt-get.cc:795 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:836 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:841 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:844 #, c-format msgid "Need to get %sB of archives.\n" msgstr "" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:849 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" -#: cmdline/apt-get.cc:850 +#: cmdline/apt-get.cc:852 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166 +#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:871 +#: cmdline/apt-get.cc:876 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:889 +#: cmdline/apt-get.cc:894 msgid "Yes, do as I say!" msgstr "" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:896 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -768,75 +767,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 msgid "Abort." msgstr "" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:917 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344 -#: apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1007 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223 +#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1014 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1018 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1023 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1024 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1082 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1093 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1081 +#: cmdline/apt-get.cc:1111 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1122 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1104 +#: cmdline/apt-get.cc:1134 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1139 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1144 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -844,111 +842,131 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1163 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1166 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1186 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1164 +#: cmdline/apt-get.cc:1194 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1223 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1225 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1231 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1348 +#, c-format +msgid "No source package '%s' picking '%s' instead\n" +msgstr "" + +#: cmdline/apt-get.cc:1385 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1351 +#: cmdline/apt-get.cc:1398 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1454 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1435 +#: cmdline/apt-get.cc:1503 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" -#: cmdline/apt-get.cc:1437 +#: cmdline/apt-get.cc:1505 +#, c-format +msgid "%lu packages were automatically installed and are no longer required.\n" +msgstr "" + +#: cmdline/apt-get.cc:1506 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1442 +#: cmdline/apt-get.cc:1511 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733 +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << endl; +#. } +#. +#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1449 +#: cmdline/apt-get.cc:1518 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1468 +#: cmdline/apt-get.cc:1537 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1592 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674 +#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1661 +#: cmdline/apt-get.cc:1730 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1761 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1774 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1708 +#: cmdline/apt-get.cc:1777 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:1789 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -956,160 +974,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1728 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" - -#: cmdline/apt-get.cc:1736 +#: cmdline/apt-get.cc:1807 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1765 +#: cmdline/apt-get.cc:1836 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1854 +#: cmdline/apt-get.cc:1925 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1855 +#: cmdline/apt-get.cc:1926 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1883 +#: cmdline/apt-get.cc:1955 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112 -#: methods/ftp.cc:707 methods/ftp.cc:708 +#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1891 +#: cmdline/apt-get.cc:1963 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966 +#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2066 +#: cmdline/apt-get.cc:2138 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2145 +#: cmdline/apt-get.cc:2217 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2173 +#: cmdline/apt-get.cc:2248 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2179 +#: cmdline/apt-get.cc:2254 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2257 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2188 +#: cmdline/apt-get.cc:2263 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2219 +#: cmdline/apt-get.cc:2294 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2247 +#: cmdline/apt-get.cc:2322 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2334 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2260 +#: cmdline/apt-get.cc:2335 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2352 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2296 +#: cmdline/apt-get.cc:2371 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:2387 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2340 +#: cmdline/apt-get.cc:2415 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2435 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2412 +#: cmdline/apt-get.cc:2487 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2465 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2576 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2603 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2542 +#: cmdline/apt-get.cc:2619 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2546 +#: cmdline/apt-get.cc:2624 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2578 +#: cmdline/apt-get.cc:2656 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2697 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1125,7 +1135,7 @@ msgid "" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" " autoremove - Remove automatically all unused packages\n" -" purge - Remove and purge packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1153,6 +1163,14 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" +#: cmdline/apt-get.cc:2864 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "" @@ -1219,11 +1237,11 @@ msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "Some errors occurred while unpacking. I'm going to configure the" +msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "" #: dselect/install:102 -msgid "packages that were installed. This may result in duplicate errors" +msgid "will be configured. This may result in duplicate errors" msgstr "" #: dselect/install:103 @@ -1268,7 +1286,12 @@ msgstr "" msgid "Error reading archive member header" msgstr "" -#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +#: apt-inst/contrib/arfile.cc:90 +#, c-format +msgid "Invalid archive member header %s" +msgstr "" + +#: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "" @@ -1370,15 +1393,11 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821 -#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 -#: apt-pkg/contrib/configuration.cc:822 apt-pkg/contrib/cdromutl.cc:157 -#: apt-pkg/sourcelist.cc:166 apt-pkg/sourcelist.cc:172 -#: apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 apt-pkg/init.cc:89 -#: apt-pkg/init.cc:97 apt-pkg/clean.cc:33 apt-pkg/policy.cc:281 -#: apt-pkg/policy.cc:287 apt-pkg/contrib/configuration.cc:843 -#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 +#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 +#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 +#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 +#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" msgstr "" @@ -1408,9 +1427,7 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 -#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 -#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:763 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 #: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 #: apt-pkg/pkgcachegen.cc:961 msgid "Reading package lists" @@ -1512,37 +1529,31 @@ msgstr "" msgid "Unparsable control file" msgstr "" -#: apt-inst/contrib/arfile.cc:90 -#, c-format -msgid "Invalid archive member header %s" -msgstr "" - -#: methods/cdrom.cc:114 methods/cdrom.cc:200 +#: methods/cdrom.cc:200 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" -#: methods/cdrom.cc:123 methods/cdrom.cc:209 +#: methods/cdrom.cc:209 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -#: methods/cdrom.cc:131 methods/cdrom.cc:219 +#: methods/cdrom.cc:219 msgid "Wrong CD-ROM" msgstr "" -#: methods/cdrom.cc:166 methods/cdrom.cc:245 +#: methods/cdrom.cc:245 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:171 methods/cdrom.cc:250 +#: methods/cdrom.cc:250 msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 -#: methods/cdrom.cc:258 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "" @@ -1560,157 +1571,147 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 methods/ftp.cc:167 methods/ftp.cc:168 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "" -#: methods/ftp.cc:168 methods/ftp.cc:173 methods/ftp.cc:174 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "" -#: methods/ftp.cc:173 methods/ftp.cc:178 methods/ftp.cc:179 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "" -#: methods/ftp.cc:204 methods/ftp.cc:232 methods/ftp.cc:209 methods/ftp.cc:237 #: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:210 methods/ftp.cc:215 methods/ftp.cc:216 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "" -#: methods/ftp.cc:217 methods/ftp.cc:222 methods/ftp.cc:223 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "" -#: methods/ftp.cc:237 methods/ftp.cc:242 methods/ftp.cc:243 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -#: methods/ftp.cc:265 methods/ftp.cc:270 methods/ftp.cc:271 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" -#: methods/ftp.cc:291 methods/ftp.cc:296 methods/ftp.cc:297 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "" -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 -#: methods/ftp.cc:334 methods/ftp.cc:445 methods/ftp.cc:335 methods/ftp.cc:446 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "" -#: methods/ftp.cc:335 methods/ftp.cc:340 methods/ftp.cc:341 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190 -#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:541 methods/ftp.cc:344 -#: apt-pkg/contrib/fileutl.cc:543 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "" -#: methods/ftp.cc:345 methods/rsh.cc:197 methods/ftp.cc:350 methods/ftp.cc:351 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "" -#: methods/ftp.cc:362 methods/ftp.cc:374 methods/ftp.cc:367 methods/ftp.cc:379 #: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232 -#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:580 methods/ftp.cc:452 -#: apt-pkg/contrib/fileutl.cc:582 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "" -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 methods/ftp.cc:692 -#: methods/ftp.cc:698 methods/ftp.cc:734 methods/ftp.cc:699 methods/ftp.cc:735 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "" -#: methods/ftp.cc:698 methods/ftp.cc:703 methods/ftp.cc:704 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "" -#: methods/ftp.cc:704 methods/ftp.cc:709 methods/ftp.cc:710 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "" -#: methods/ftp.cc:722 methods/ftp.cc:727 methods/ftp.cc:728 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "" -#: methods/ftp.cc:736 methods/ftp.cc:741 methods/ftp.cc:742 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "" -#: methods/ftp.cc:740 methods/ftp.cc:745 methods/ftp.cc:746 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "" -#: methods/ftp.cc:747 methods/ftp.cc:752 methods/ftp.cc:753 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "" -#: methods/ftp.cc:779 methods/ftp.cc:784 methods/ftp.cc:785 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "" -#: methods/ftp.cc:789 methods/ftp.cc:794 methods/ftp.cc:795 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "" -#: methods/ftp.cc:798 methods/ftp.cc:803 methods/ftp.cc:804 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "" -#: methods/ftp.cc:818 methods/ftp.cc:823 methods/ftp.cc:824 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "" -#: methods/ftp.cc:825 methods/ftp.cc:830 methods/ftp.cc:831 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303 -#: methods/ftp.cc:869 methods/http.cc:996 methods/ftp.cc:870 -#: methods/http.cc:999 +#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" -#: methods/ftp.cc:877 methods/ftp.cc:882 methods/ftp.cc:883 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "" -#: methods/ftp.cc:892 methods/rsh.cc:322 methods/ftp.cc:897 methods/ftp.cc:898 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "" -#: methods/ftp.cc:922 methods/ftp.cc:927 methods/ftp.cc:928 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "" #. Get the files information -#: methods/ftp.cc:997 methods/ftp.cc:1002 methods/ftp.cc:1005 +#: methods/ftp.cc:1005 msgid "Query" msgstr "" -#: methods/ftp.cc:1109 methods/ftp.cc:1114 methods/ftp.cc:1117 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "" @@ -1768,41 +1769,41 @@ msgstr "" #: methods/connect.cc:240 #, c-format -msgid "Unable to connect to %s %s:" +msgid "Unable to connect to %s:%s:" msgstr "" -#: methods/gpgv.cc:65 methods/gpgv.cc:71 +#: methods/gpgv.cc:71 #, c-format msgid "Couldn't access keyring: '%s'" msgstr "" -#: methods/gpgv.cc:101 methods/gpgv.cc:107 +#: methods/gpgv.cc:107 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:205 methods/gpgv.cc:223 +#: methods/gpgv.cc:223 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:210 methods/gpgv.cc:228 +#: methods/gpgv.cc:228 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:214 methods/gpgv.cc:232 +#: methods/gpgv.cc:232 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:219 methods/gpgv.cc:237 +#: methods/gpgv.cc:237 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:271 methods/gpgv.cc:278 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:257 methods/gpgv.cc:285 +#: methods/gpgv.cc:285 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1818,160 +1819,173 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:377 methods/http.cc:384 methods/http.cc:385 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:523 methods/http.cc:530 methods/http.cc:531 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:531 methods/http.cc:538 methods/http.cc:539 +#: methods/http.cc:539 msgid "Bad header line" msgstr "" -#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:564 #: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:586 methods/http.cc:593 methods/http.cc:594 +#: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:601 methods/http.cc:608 methods/http.cc:609 +#: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:603 methods/http.cc:610 methods/http.cc:611 +#: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:627 methods/http.cc:634 methods/http.cc:635 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "" -#: methods/http.cc:774 methods/http.cc:787 methods/http.cc:790 +#: methods/http.cc:790 msgid "Select failed" msgstr "" -#: methods/http.cc:779 methods/http.cc:792 methods/http.cc:795 +#: methods/http.cc:795 msgid "Connection timed out" msgstr "" -#: methods/http.cc:802 methods/http.cc:815 methods/http.cc:818 +#: methods/http.cc:818 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:833 methods/http.cc:846 methods/http.cc:849 +#: methods/http.cc:849 msgid "Error writing to file" msgstr "" -#: methods/http.cc:861 methods/http.cc:874 methods/http.cc:877 +#: methods/http.cc:877 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:875 methods/http.cc:888 methods/http.cc:891 +#: methods/http.cc:891 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:877 methods/http.cc:890 methods/http.cc:893 +#: methods/http.cc:893 msgid "Error reading from server" msgstr "" -#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 methods/http.cc:981 -#: apt-pkg/contrib/mmap.cc:215 methods/http.cc:984 +#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" msgstr "" -#: methods/http.cc:1105 methods/http.cc:1146 methods/http.cc:1149 +#: methods/http.cc:1149 msgid "Bad header data" msgstr "" -#: methods/http.cc:1122 methods/http.cc:1177 methods/http.cc:1163 -#: methods/http.cc:1218 methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1166 methods/http.cc:1221 msgid "Connection failed" msgstr "" -#: methods/http.cc:1229 methods/http.cc:1310 methods/http.cc:1313 +#: methods/http.cc:1313 msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:80 apt-pkg/contrib/mmap.cc:76 +#: apt-pkg/contrib/mmap.cc:76 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:85 apt-pkg/contrib/mmap.cc:81 -#: apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:213 -msgid "Dynamic MMap ran out of room" +#: apt-pkg/contrib/mmap.cc:234 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " +"Current value: %lu. (man 5 apt.conf)" +msgstr "" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:346 +#, c-format +msgid "%lid %lih %limin %lis" +msgstr "" + +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:353 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:360 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:365 +#, c-format +msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1014 apt-pkg/contrib/strutl.cc:1029 #: apt-pkg/contrib/strutl.cc:1040 #, c-format msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:439 apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:458 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:497 apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:516 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:662 apt-pkg/contrib/configuration.cc:663 #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:681 apt-pkg/contrib/configuration.cc:682 #: apt-pkg/contrib/configuration.cc:703 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:699 #: apt-pkg/contrib/configuration.cc:720 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:738 apt-pkg/contrib/configuration.cc:739 #: apt-pkg/contrib/configuration.cc:760 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:745 apt-pkg/contrib/configuration.cc:746 #: apt-pkg/contrib/configuration.cc:767 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754 -#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755 #: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:758 apt-pkg/contrib/configuration.cc:759 #: apt-pkg/contrib/configuration.cc:780 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:809 apt-pkg/contrib/configuration.cc:810 #: apt-pkg/contrib/configuration.cc:831 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" @@ -2038,15 +2052,13 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:188 apt-pkg/contrib/cdromutl.cc:195 +#: apt-pkg/contrib/cdromutl.cc:195 msgid "Failed to stat the cdrom" msgstr "" @@ -2075,154 +2087,152 @@ msgstr "" msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:454 apt-pkg/contrib/fileutl.cc:455 #: apt-pkg/contrib/fileutl.cc:456 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 apt-pkg/contrib/fileutl.cc:460 +#: apt-pkg/contrib/fileutl.cc:458 +#, c-format +msgid "Sub-process %s received signal %u." +msgstr "" + #: apt-pkg/contrib/fileutl.cc:462 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:459 apt-pkg/contrib/fileutl.cc:462 #: apt-pkg/contrib/fileutl.cc:464 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:503 apt-pkg/contrib/fileutl.cc:506 #: apt-pkg/contrib/fileutl.cc:508 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:559 apt-pkg/contrib/fileutl.cc:562 #: apt-pkg/contrib/fileutl.cc:564 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:589 apt-pkg/contrib/fileutl.cc:592 #: apt-pkg/contrib/fileutl.cc:594 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:664 apt-pkg/contrib/fileutl.cc:667 #: apt-pkg/contrib/fileutl.cc:669 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:670 apt-pkg/contrib/fileutl.cc:673 #: apt-pkg/contrib/fileutl.cc:675 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:681 apt-pkg/contrib/fileutl.cc:684 #: apt-pkg/contrib/fileutl.cc:686 msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:132 apt-pkg/pkgcache.cc:133 +#: apt-pkg/pkgcache.cc:133 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:138 apt-pkg/pkgcache.cc:139 +#: apt-pkg/pkgcache.cc:139 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:144 +#: apt-pkg/pkgcache.cc:144 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:149 +#: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:225 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:225 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:225 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:226 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:226 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:226 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:226 apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:227 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:226 apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:227 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:227 +msgid "Enhances" +msgstr "" + +#: apt-pkg/pkgcache.cc:238 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:238 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:238 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:238 apt-pkg/pkgcache.cc:239 +#: apt-pkg/pkgcache.cc:239 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:238 apt-pkg/pkgcache.cc:239 +#: apt-pkg/pkgcache.cc:239 msgid "extra" msgstr "" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:123 -#: apt-pkg/depcache.cc:152 +#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:122 apt-pkg/depcache.cc:124 +#: apt-pkg/depcache.cc:124 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:153 +#: apt-pkg/depcache.cc:153 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:219 apt-pkg/depcache.cc:223 +#: apt-pkg/depcache.cc:223 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:225 apt-pkg/depcache.cc:229 +#: apt-pkg/depcache.cc:229 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" @@ -2262,35 +2272,32 @@ msgstr "" msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:206 #, c-format msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 apt-pkg/sourcelist.cc:223 -#: apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:236 apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:243 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:240 apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:247 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:428 apt-pkg/packagemanager.cc:436 -#: apt-pkg/packagemanager.cc:440 +#: apt-pkg/packagemanager.cc:439 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2303,47 +2310,46 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248 +#: apt-pkg/algorithms.cc:248 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1106 apt-pkg/algorithms.cc:1138 +#: apt-pkg/algorithms.cc:1138 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1108 apt-pkg/algorithms.cc:1140 +#: apt-pkg/algorithms.cc:1140 msgid "Unable to correct problems, you have held broken packages." msgstr "" -#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372 #: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60 +#: apt-pkg/acquire.cc:60 #, c-format msgid "Lists directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64 +#: apt-pkg/acquire.cc:64 #, c-format msgid "Archive directory %spartial is missing." msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:828 apt-pkg/acquire.cc:826 +#: apt-pkg/acquire.cc:826 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:830 apt-pkg/acquire.cc:828 +#: apt-pkg/acquire.cc:828 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2358,21 +2364,21 @@ msgstr "" msgid "Method %s did not start correctly" msgstr "" -#: apt-pkg/acquire-worker.cc:399 apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:413 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:124 apt-pkg/init.cc:132 apt-pkg/init.cc:133 +#: apt-pkg/init.cc:133 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:140 apt-pkg/init.cc:148 apt-pkg/init.cc:149 +#: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:57 apt-pkg/clean.cc:56 +#: apt-pkg/clean.cc:56 #, c-format msgid "Unable to stat %s." msgstr "" @@ -2389,135 +2395,130 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:267 -msgid "Invalid record in the preferences file, no Package header" +#: apt-pkg/policy.cc:347 +#, c-format +msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:289 apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:369 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:297 apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:377 msgid "No priority (or zero) specified for pin" msgstr "" -#: apt-pkg/pkgcachegen.cc:72 apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:74 msgid "Cache has an incompatible versioning system" msgstr "" -#: apt-pkg/pkgcachegen.cc:115 apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:130 apt-pkg/pkgcachegen.cc:132 +#: apt-pkg/pkgcachegen.cc:132 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:166 +#: apt-pkg/pkgcachegen.cc:166 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:191 +#: apt-pkg/pkgcachegen.cc:191 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:195 +#: apt-pkg/pkgcachegen.cc:195 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:226 +#: apt-pkg/pkgcachegen.cc:226 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:230 +#: apt-pkg/pkgcachegen.cc:230 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:234 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:258 +#: apt-pkg/pkgcachegen.cc:258 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:264 +#: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:254 apt-pkg/pkgcachegen.cc:267 +#: apt-pkg/pkgcachegen.cc:267 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:270 +#: apt-pkg/pkgcachegen.cc:270 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:260 apt-pkg/pkgcachegen.cc:273 +#: apt-pkg/pkgcachegen.cc:273 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:301 +#: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:314 +#: apt-pkg/pkgcachegen.cc:314 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:320 +#: apt-pkg/pkgcachegen.cc:320 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:693 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:763 apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:778 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 #: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:128 +#: apt-pkg/acquire-item.cc:128 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:394 #: apt-pkg/acquire-item.cc:395 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408 -#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406 #: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1101 #: apt-pkg/acquire-item.cc:1106 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1211 #: apt-pkg/acquire-item.cc:1216 #, c-format msgid "" @@ -2525,7 +2526,6 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1270 #: apt-pkg/acquire-item.cc:1275 #, c-format msgid "" @@ -2533,287 +2533,229 @@ msgid "" "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1311 #: apt-pkg/acquire-item.cc:1316 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1398 #: apt-pkg/acquire-item.cc:1403 msgid "Size mismatch" msgstr "" +#: apt-pkg/indexrecords.cc:40 +#, c-format +msgid "Unable to parse Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:47 +#, c-format +msgid "No sections in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:81 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:529 apt-pkg/cdrom.cc:525 +#: apt-pkg/cdrom.cc:525 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 apt-pkg/cdrom.cc:534 -#: apt-pkg/cdrom.cc:622 +#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:563 apt-pkg/cdrom.cc:559 +#: apt-pkg/cdrom.cc:559 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 apt-pkg/cdrom.cc:566 -#: apt-pkg/cdrom.cc:836 +#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:590 apt-pkg/cdrom.cc:585 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:608 apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:620 apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:638 apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:678 apt-pkg/cdrom.cc:673 +#: apt-pkg/cdrom.cc:673 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" "zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:715 apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:684 +msgid "" +"Unable to locate any package files, perhaps this is not a Debian Disc or the " +"wrong architecture?" +msgstr "" + +#: apt-pkg/cdrom.cc:710 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:744 apt-pkg/cdrom.cc:739 +#: apt-pkg/cdrom.cc:739 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:760 apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:764 apt-pkg/cdrom.cc:759 +#: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:790 apt-pkg/cdrom.cc:785 +#: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:799 apt-pkg/cdrom.cc:794 +#: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:832 apt-pkg/indexcopy.cc:835 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834 apt-pkg/indexcopy.cc:837 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837 apt-pkg/indexcopy.cc:840 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840 apt-pkg/indexcopy.cc:843 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:486 apt-pkg/deb/dpkgpm.cc:546 -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/indexcopy.cc:530 #, c-format -msgid "Directory '%s' missing" +msgid "Skipping nonexistent file %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:570 apt-pkg/deb/dpkgpm.cc:635 -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/indexcopy.cc:536 #, c-format -msgid "Preparing %s" +msgid "Can't find authentication record for: %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:571 apt-pkg/deb/dpkgpm.cc:636 -#: apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/indexcopy.cc:542 #, c-format -msgid "Unpacking %s" +msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:641 -#: apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:49 #, c-format -msgid "Preparing to configure %s" +msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:577 apt-pkg/deb/dpkgpm.cc:606 -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642 -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:579 apt-pkg/deb/dpkgpm.cc:580 -#, c-format -msgid "Processing triggers for %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:582 apt-pkg/deb/dpkgpm.cc:643 -#: apt-pkg/deb/dpkgpm.cc:662 -#, c-format -msgid "Installed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:587 apt-pkg/deb/dpkgpm.cc:589 -#: apt-pkg/deb/dpkgpm.cc:590 apt-pkg/deb/dpkgpm.cc:648 -#: apt-pkg/deb/dpkgpm.cc:667 -#, c-format -msgid "Preparing for removal of %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:592 apt-pkg/deb/dpkgpm.cc:607 -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649 -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:593 apt-pkg/deb/dpkgpm.cc:650 -#: apt-pkg/deb/dpkgpm.cc:669 -#, c-format -msgid "Removed %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:598 apt-pkg/deb/dpkgpm.cc:655 -#: apt-pkg/deb/dpkgpm.cc:674 -#, c-format -msgid "Preparing to completely remove %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:599 apt-pkg/deb/dpkgpm.cc:656 -#: apt-pkg/deb/dpkgpm.cc:675 -#, c-format -msgid "Completely removed %s" -msgstr "" - -#. populate the "processing" map -#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:49 +#: apt-pkg/deb/dpkgpm.cc:52 #, c-format -msgid "Installing %s" +msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:52 apt-pkg/deb/dpkgpm.cc:53 +#: apt-pkg/deb/dpkgpm.cc:53 #, c-format msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:759 apt-pkg/deb/dpkgpm.cc:822 -#: apt-pkg/deb/dpkgpm.cc:879 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" -msgstr "" - -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "" - -#: methods/rsh.cc:330 -msgid "Connection closed prematurely" -msgstr "" - -#: apt-pkg/contrib/mmap.cc:234 -#, c-format -msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " -"Current value: %lu. (man 5 apt.conf)" -msgstr "" - -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 apt-pkg/contrib/strutl.cc:346 +#: apt-pkg/deb/dpkgpm.cc:558 #, c-format -msgid "%lid %lih %limin %lis" +msgid "Directory '%s' missing" msgstr "" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 apt-pkg/contrib/strutl.cc:353 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format -msgid "%lih %limin %lis" +msgid "Preparing %s" msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 apt-pkg/contrib/strutl.cc:360 +#: apt-pkg/deb/dpkgpm.cc:655 #, c-format -msgid "%limin %lis" +msgid "Unpacking %s" msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:354 apt-pkg/contrib/strutl.cc:365 +#: apt-pkg/deb/dpkgpm.cc:660 #, c-format -msgid "%lis" +msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/deb/dpkgpm.cc:662 #, c-format -msgid "Sub-process %s received signal %u." -msgstr "" - -#: apt-pkg/pkgcache.cc:227 -msgid "Enhances" +msgid "Installed %s" msgstr "" -#: apt-pkg/policy.cc:347 +#: apt-pkg/deb/dpkgpm.cc:667 #, c-format -msgid "Invalid record in the preferences file %s, no Package header" +msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/indexrecords.cc:40 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format -msgid "Unable to parse Release file %s" +msgid "Removed %s" msgstr "" -#: apt-pkg/indexrecords.cc:47 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format -msgid "No sections in Release file %s" +msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/deb/dpkgpm.cc:675 #, c-format -msgid "No Hash entry in Release file %s" +msgid "Completely removed %s" msgstr "" -#: apt-pkg/cdrom.cc:684 -msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +#: apt-pkg/deb/dpkgpm.cc:879 +msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:851 apt-pkg/deb/dpkgpm.cc:908 +#: apt-pkg/deb/dpkgpm.cc:908 msgid "Running dpkg" msgstr "" @@ -2839,46 +2781,10 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "" - -#: methods/connect.cc:240 -#, c-format -msgid "Unable to connect to %s:%s:" -msgstr "" - -#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586 -#, c-format -msgid "" -"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" - -#: apt-pkg/packagemanager.cc:478 -#, c-format -msgid "" -"Could not perform immediate configuration on already unpacked '%s'.Please " -"see man 5 apt.conf under APT::Immediate-Configure for details." -msgstr "" - -#: apt-pkg/indexcopy.cc:530 -#, c-format -msgid "Skipping nonexistent file %s" -msgstr "" - -#: apt-pkg/indexcopy.cc:536 -#, c-format -msgid "Can't find authentication record for: %s" -msgstr "" - -#: apt-pkg/indexcopy.cc:542 -#, c-format -msgid "Hash mismatch for: %s" +#: methods/rred.cc:219 +msgid "Could not patch file" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:52 -#, c-format -msgid "Completely removing %s" +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" msgstr "" diff --git a/po/ar.po b/po/ar.po index 76da797f5..eaa24a32f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2006-10-20 21:28+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s لـ%s %s مُجمّع على %s %s\n" @@ -432,26 +432,26 @@ msgstr "*** فشل ربط %s بـ%s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -555,7 +555,7 @@ msgstr "فشل تغيير اسم %s إلى %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -700,7 +700,7 @@ msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ " msgid "Some packages could not be authenticated" msgstr "تعذرت المصادقة على بعض الحزم" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "هناك مشاكل وتم استخدام -y دون --force-yes" @@ -716,11 +716,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "تعذرت قراءة قائمة المصادر." @@ -749,25 +749,26 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "ليس هناك مساحة كافية في %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "نعم، افعل ما أقوله!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -778,28 +779,28 @@ msgstr "" "كي تستمر اكتب العبارة '%s'\n" " ؟] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "إجهاض." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -807,47 +808,47 @@ msgstr "" "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --" "fix-missing؟" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "تعذر تصحيح الحزم المفقودة." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "إجهاض التثبيت." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "لاحظ، تحديد %s بدلاً من %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "الحزمة %s وهميّة وتوفّرها:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [مُثبّتة]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "يجب اختيار واحدة بالتحديد لتثبيتها." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -855,74 +856,85 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "الحزمة %s ليس لها مرشح تثبيت" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "إعادة تثبيت %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s هي النسخة الأحدث.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "تعذر قفل دليل القائمة" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -938,51 +950,51 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -990,152 +1002,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1179,7 +1191,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1581,11 +1593,11 @@ msgid "File not found" msgstr "لم يُعثر على الملف" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "فشيل تنفيذ stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "فشل تعيين وقت التعديل" @@ -1713,7 +1725,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1789,7 +1801,7 @@ msgstr "" #: methods/connect.cc:193 #, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" #: methods/connect.cc:240 @@ -1877,48 +1889,48 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "فشلت كتابة الملف %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "خطأ داخلي" @@ -1926,18 +1938,25 @@ msgstr "خطأ داخلي" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2324,7 +2343,14 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2332,6 +2358,13 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2534,40 +2567,40 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2792,8 +2825,18 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." msgstr "" #: methods/rsh.cc:330 diff --git a/po/ast.po b/po/ast.po index 74f9a0c3b..287f29c55 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-07-01 18:09+0100\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." "com>\n" @@ -148,7 +148,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compilu en %s %s\n" @@ -525,26 +525,26 @@ msgstr "*** Fall msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzose'l llmite of %sB de desenllaz.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "L'archivu nun tien el campu paquetes" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s nun tien la entrada saltos\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el curiador de %s ye %s y non %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s nun tien la entrada saltos de fonte\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" @@ -648,7 +648,7 @@ msgstr "Nun pudo renomase %s como %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin d'espresin regular - %s" @@ -793,7 +793,7 @@ msgstr " msgid "Some packages could not be authenticated" msgstr "Dellos paquetes nun pudieron autenticase" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Hai problemes y utilizose -y ensin --force-yes" @@ -809,11 +809,11 @@ msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torg msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun fin" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nun pudo lleese la llista de fontes." @@ -842,25 +842,26 @@ msgstr "Tres d'esta operaci msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Nun tienes espaciu libre bastante en %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Conseose Trivial Only pero sta nun ye una operacin trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "S, facer lo que digo!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +872,28 @@ msgstr "" "Pa continuar escribe la frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Encaboxar." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Quies continuar [S/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fall algamar %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de slo descarga" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,47 +901,47 @@ msgstr "" "Nun pudieron algamase dellos archivos, seique executando apt-get update o " "tentando --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing y cambu de mediu nun ta sofitao actualmente" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Nun pudieron iguase los paquetes que falten." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Encaboxando la instalacin." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escoyendo %s nel llugar de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, ya ta instalau y la actualizacin nun ta activada.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s nun ta instalau, nun va desaniciase\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s ye un paquete virtual ufru por:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalu]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Has d'escoyer esplcitamente unu pa instalar." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -951,58 +952,69 @@ msgstr "" "Esto puede significar que falta el paquete, ta arrumbu, o slo\n" "ta disponible dende otra fonte\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Sicas, los siguientes paquetes reemplacenlu:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s nun tien candidatu pa instalacin" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "La reinstalacin de %s nun ye dable, nun pue descargase.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s y ta na versin ms nueva.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nun s'alcontr la distribucin '%s' pa '%s'" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nun s'alcontr la versin '%s' pa '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escoyida la versin %s (%s) pa %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' eh\n" +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Nun pudo bloquiase'l direutoriu de llista" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1010,18 +1022,18 @@ msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1039,43 +1051,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin pue aidar a resolver la situacin:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompi coses" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompi coses" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Nun pudo alcontrase la tarea %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustu como instalu manualmente.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Habres d'executar `apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1083,7 +1095,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "consea una solucin)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1095,117 +1107,117 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Paquetes fraaos" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Instalarnse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Calculando l'autualizacin... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes fra coses" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Has de consear polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru y descargu '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Fall la descarga de dellos archivos." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orde de desempaquetu '%s'.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orde build '%s'.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Fall el procesu fu" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que consear polo menos un paquete pa verificar les dependencies de " "construccin" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construccin.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1214,7 +1226,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1223,32 +1235,32 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versin " "disponible del paquete %s satisfaz los requisitos de versin" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instalu %s ye " "demasiao nuevu" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construccin de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construccin" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Mdulos sofitaos:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1334,7 +1346,7 @@ msgstr "" "pa ms informacin y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1759,11 +1771,11 @@ msgid "File not found" msgstr "Nun s'atopa'l ficheru." #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Fall al lleer" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nun se pudo afitar la hora de modificacin" @@ -1891,7 +1903,7 @@ msgstr "Gandi msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexn" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1966,8 +1978,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Fallu temporal al resolver '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Daqu raru pas resolviendo '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2059,47 +2071,47 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocu" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Fall la escoyeta" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Gandi'l tiempu de conexn" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn." -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Fall al francer el ficheru" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Fallo la conexn" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Fallu internu" @@ -2107,12 +2119,12 @@ msgstr "Fallu internu" msgid "Can't mmap an empty file" msgstr "Nun se puede facer mmap d'un ficheru baleru" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nun se pudo facer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2121,6 +2133,13 @@ msgstr "" "Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau de APT::Cache-" "Limit. El valor actual ye : %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2507,7 +2526,14 @@ msgstr "Triba '%s' desconocida na llinia %u de la llista d'or msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinia %u mal formada na llista d'orxenes %s (id del proveedor)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2518,6 +2544,13 @@ msgstr "" "esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye " "malo, pero si daveres quies facelo, activa la opcin APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2728,19 +2761,19 @@ msgstr "Fallu de E/S al grabar cach msgid "rename failed, %s (%s -> %s)." msgstr "fall'l cambiu de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "La suma MD5 nun concasa" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pblica denguna disponible pa les IDs de clave darru:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2749,7 +2782,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete (por faltar una arquitectura)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2758,7 +2791,7 @@ msgstr "" "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que " "necesites iguar manualmente esti paquete" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2766,7 +2799,7 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "El tamau nun concasa" @@ -2998,14 +3031,30 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiu" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nun fui quien a parchiar el ficheru" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexn encaboxada prematuramente" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' eh\n" + +#~ msgid "Could not patch file" +#~ msgstr "Nun fui quien a parchiar el ficheru" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/bg.po b/po/bg.po index bc905ac74..f2e499e5e 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-01-27 12:41+0200\n" "Last-Translator: Damyan Ivanov <dmn@debian.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" @@ -538,26 +538,26 @@ msgstr "*** Неуспех при създаването на връзка %s к msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" @@ -661,7 +661,7 @@ msgstr "Неуспех при преименуването на %s на %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -808,7 +808,7 @@ msgstr "Инсталиране на тези пакети без проверк msgid "Some packages could not be authenticated" msgstr "Някои пакети не можаха да бъдат удостоверени" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" @@ -824,11 +824,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." @@ -860,25 +860,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Нямате достатъчно свободно пространство в %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Указано е „Trivial Only“, но това не е тривиална операция." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Да, прави каквото казвам!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -889,28 +890,28 @@ msgstr "" "За да продължите, въведете фразата „%s“\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Прекъсване." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -918,47 +919,47 @@ msgstr "" "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " "или да опитате с „--fix-missing“?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Неуспех при коригирането на липсващите пакети." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Прекъсване на инсталирането." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Забележете, избиране на %s вместо %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Инсталиран]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Трябва изрично да изберете един за инсталиране." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -969,75 +970,87 @@ msgstr "" "Това може да означава, че пакета липсва, остарял е, или е достъпен\n" "само от друг източник\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Обаче следните пакети го заместват:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Пакетът %s няма кандидат за инсталиране" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s вече е най-новата версия.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Не е намерено издание „%s“ на „%s“" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Не е намерена версия „%s“ на „%s“" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Избрана е версия %s (%s) за %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "" +"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Използвайте „apt-get autoremove“ за да ги премахнете." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1055,44 +1068,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Неуспех при намирането на задача %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1100,7 +1113,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1112,118 +1125,118 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1232,7 +1245,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1242,32 +1255,32 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1354,7 +1367,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1772,11 +1785,11 @@ msgid "File not found" msgstr "Файлът не е намерен" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Неуспех при получаването на атрибути" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Неуспех при задаването на време на промяна" @@ -1906,7 +1919,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1981,8 +1994,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Временен неуспех при намирането на IP адреса на „%s“" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)" #: methods/connect.cc:240 @@ -2078,47 +2091,47 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Неуспех при отрязване на края на файла" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2126,18 +2139,25 @@ msgstr "Вътрешна грешка" msgid "Can't mmap an empty file" msgstr "Невъзможно е да се прехвърли в паметта празен файл" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неуспех при прехвърлянето в паметта на %lu байта" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2532,7 +2552,14 @@ msgstr "" "Лошо форматиран ред %u в списъка с източници %s (идентификатор на " "производител)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2544,6 +2571,13 @@ msgstr "" "пакет %s. Това често е лошо, но ако наистина искате да го направите, " "активирайте опцията APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2761,19 +2795,19 @@ msgstr "Входно/изходна грешка при запазването msgid "rename failed, %s (%s -> %s)." msgstr "преименуването се провали, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2782,7 +2816,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2791,14 +2825,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -3028,14 +3062,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Неуспех при закърпване на файла" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Връзката прекъсна преждевременно" +#~ msgid "Could not patch file" +#~ msgstr "Неуспех при закърпване на файла" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/bs.po b/po/bs.po index 16964875d..e1a09c513 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -152,7 +152,7 @@ msgstr "" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -440,26 +440,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -563,7 +563,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -708,7 +708,7 @@ msgstr "" msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "" @@ -724,11 +724,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -757,25 +757,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Da, uradi kako kažem!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -783,75 +784,75 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Odustani." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Odustajem od instalacije." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr "[Instalirano]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -859,74 +860,85 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Međutim, slijedeći paketi ga zamjenjuju:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Slijedeći NOVI paketi će biti instalirani:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -942,49 +954,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -992,152 +1004,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1181,7 +1193,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1578,11 +1590,11 @@ msgid "File not found" msgstr "Datoteka nije pronađena" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@ -1709,7 +1721,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1785,7 +1797,7 @@ msgstr "" #: methods/connect.cc:193 #, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" #: methods/connect.cc:240 @@ -1874,48 +1886,48 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Ne mogu ukloniti %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1923,18 +1935,25 @@ msgstr "Unutrašnja greška" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2322,7 +2341,14 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2330,6 +2356,13 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2532,39 +2565,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "" @@ -2789,8 +2822,18 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." msgstr "" #: methods/rsh.cc:330 diff --git a/po/ca.po b/po/ca.po index 7a3414f49..eb15b637e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-06-06 02:17+0200\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s per a %s compilat el %s %s\n" @@ -528,26 +528,26 @@ msgstr "*** No s'ha pogut enllaçar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink s'ha arribat al límit de %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" @@ -651,7 +651,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -796,7 +796,7 @@ msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? " msgid "Some packages could not be authenticated" msgstr "No s'ha pogut autenticar alguns paquets" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes" @@ -815,11 +815,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "S'ha produït un error intern, l'ordenació no ha acabat" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "No és possible blocar el directori de descàrrega" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No s'ha pogut llegir la llista de les fonts." @@ -850,25 +850,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "No teniu prou espai lliure en %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Es va especificar Trivial Only però aquesta operació no és trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Sí, fes el que et dic!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -879,28 +880,28 @@ msgstr "" "Per a continuar escriviu la frase «%s»\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Avortat." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -908,48 +909,48 @@ msgstr "" "No es poden baixar alguns arxius, proveu a executar apt-get update o " "intenteu-ho amb --fix-missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i els medi intercanviables actualment no estan suportats" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "No es poden corregir els paquets que falten." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "S'està avortant la instal·lació." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota: s'està seleccionant %s en comptes de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquet %s és un paquet virtual proveït per:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instal·lat]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,77 +961,88 @@ msgstr "" "en fa referència. Això normalment vol dir que el paquet falta,\n" "s'ha tornat obsolet o només és disponible des d'una altra font.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Tot i que els següents paquets el reemplacen:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquet %s no té candidat d'instal·lació" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ja es troba en la versió més recent.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No s'ha trobat la versió puntual «%s» per a «%s»" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No s'ha trobat la versió «%s» per a «%s»" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n" +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor " "automàtic" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Els paquets següents s'instal·laren automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Els paquets següents s'instal·laren automàticament i ja no són necessaris:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1048,43 +1060,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "La informació següent pot ajudar-vos a resoldre la situació:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "No s'ha pogut trobar la tasca %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instal·lat manualment.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1092,7 +1104,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1104,120 +1116,120 @@ msgstr "" "unstable i alguns paquets requerits encara no han estat creats o bé\n" "encara no els hi han afegit." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" "S'ha produït un error intern, el solucionador de problemes ha trencat coses" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Haureu d'especificar un paquet de codi font per a baixar" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "No es pot trobar un paquet de fonts per a %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es necessita baixar %sB/%sB d'arxius font.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Obté el font %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "S'ha d'especificar un paquet per a verificar les dependències de construcció " "per a" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "No es pot obtenir informació sobre les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1226,7 +1238,7 @@ msgstr "" "La dependència %s en %s no es pot satisfer per que no es pot trobar el " "paquet %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1235,32 +1247,32 @@ msgstr "" "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %" "s pot satisfer els requeriments de versions" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s " "és massa nou" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No s'han pogut satisfer les dependències de construcció per a %s" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1346,7 +1358,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1768,11 +1780,11 @@ msgid "File not found" msgstr "Fitxer no trobat" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "L'estat ha fallat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "No s'ha pogut establir el temps de modificació" @@ -1901,7 +1913,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades" msgid "Unable to accept connection" msgstr "No es pot acceptar la connexió" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1976,8 +1988,8 @@ msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)" #: methods/connect.cc:240 @@ -2073,48 +2085,48 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat" msgid "Unknown date format" msgstr "Format de la data desconegut" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" "S'ha produït un error en llegir, el servidor remot ha tancat la connexió" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "No s'ha pogut truncar el fitxer %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Error intern" @@ -2122,12 +2134,12 @@ msgstr "Error intern" msgid "Can't mmap an empty file" msgstr "No es pot transferir un fitxer buit a memòria" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No s'ha pogut crear un mapa de memòria de %lu octets" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2136,6 +2148,13 @@ msgstr "" "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. " "Valor actual: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2522,7 +2541,14 @@ msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2534,6 +2560,13 @@ msgstr "" "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-" "LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2753,19 +2786,19 @@ msgstr "Error d'E/S en desar la memòria cau de la font" msgid "rename failed, %s (%s -> %s)." msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "La suma MD5 no concorda" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2775,7 +2808,7 @@ msgstr "" "significar que haureu d'arreglar aquest paquet manualment (segons " "arquitectura)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2784,7 +2817,7 @@ msgstr "" "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu " "d'arreglar aquest paquet manualment." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2792,7 +2825,7 @@ msgstr "" "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp " "per al paquet %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "La mida no concorda" @@ -3024,14 +3057,30 @@ msgstr "" msgid "Not locked" msgstr "No blocat" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "No s'ha pogut aplicar el pedaç al fitxer" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La connexió s'ha tancat prematurament" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n" + +#~ msgid "Could not patch file" +#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/cs.po b/po/cs.po index e705b42f0..62b45a6c8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-16 18:05+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pro %s zkompilován na %s %s\n" @@ -523,26 +523,26 @@ msgstr "*** Nezdařilo se slinkovat %s s %s" msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" @@ -646,7 +646,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -791,7 +791,7 @@ msgstr "Instalovat tyto balíky bez ověření [y/N]? " msgid "Some packages could not be authenticated" msgstr "Některé balíky nemohly být autentizovány" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes" @@ -807,11 +807,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -841,25 +841,26 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po této operaci bude na disku uvolněno %sB.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s nemáte dostatek volného místa." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ano, udělej to tak, jak říkám!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -870,28 +871,28 @@ msgstr "" "Pro pokračování opište frázi „%s“\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Přerušeno." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -899,47 +900,47 @@ msgstr "" "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --" "fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing a výměna média nejsou momentálně podporovány" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Nemohu opravit chybějící balíky." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Přerušuji instalaci." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pozn: Vybírám %s místo %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Přeskakuji %s, protože je již nainstalován.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Balík %s není nainstalován, nelze tedy odstranit\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Balík %s je virtuální balík poskytovaný:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr "[Instalovaný]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Měli byste explicitně vybrat jeden k instalaci." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -950,75 +951,86 @@ msgstr "" "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n" "pouze z jiného zdroje\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Nicméně následující balíky jej nahrazují:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Balík %s nemá kandidáta pro instalaci" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s je již nejnovější verze.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Verze „%s“ pro „%s“ nebyla nalezena" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Pro jejich odstranění použijte „apt-get autoremove“." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1036,43 +1048,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Nemohu najít úlohu %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1080,7 +1092,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1091,124 +1103,124 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1217,31 +1229,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1325,7 +1337,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1740,11 +1752,11 @@ msgid "File not found" msgstr "Soubor nebyl nalezen" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Selhalo vyhodnocení" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nelze nastavit čas modifikace" @@ -1872,7 +1884,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1947,8 +1959,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování „%s“" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (%i)" #: methods/connect.cc:240 @@ -2039,47 +2051,47 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Nelze zmenšit soubor" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2087,18 +2099,25 @@ msgstr "Vnitřní chyba" msgid "Can't mmap an empty file" msgstr "Nemohu provést mmap prázdného souboru" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nešlo mmapovat %lu bajtů" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2485,7 +2504,14 @@ msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2496,6 +2522,13 @@ msgstr "" "smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně " "chcete udělat, aktivujte možnost APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2703,19 +2736,19 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Neshoda MD5 součtů" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2724,7 +2757,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2733,14 +2766,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2969,14 +3002,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nemohu záplatovat soubor" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" +#~ msgid "Could not patch file" +#~ msgstr "Nemohu záplatovat soubor" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/cy.po b/po/cy.po index bc6754300..966bc6902 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -169,7 +169,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" @@ -551,26 +551,26 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -675,7 +675,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -827,7 +827,7 @@ msgstr "" msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" @@ -845,11 +845,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@ -878,25 +878,26 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -907,29 +908,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -937,49 +938,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -991,74 +992,85 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1074,46 +1086,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1122,7 +1134,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1134,118 +1146,118 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1254,7 +1266,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1263,34 +1275,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1375,7 +1387,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1813,11 +1825,11 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1948,7 +1960,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -2024,8 +2036,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2118,50 +2130,50 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:888 +#: methods/http.cc:889 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Methwyd ysgrifennu ffeil %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Gwall mewnol" @@ -2169,18 +2181,25 @@ msgstr "Gwall mewnol" msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2579,8 +2598,15 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2591,6 +2617,13 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2810,21 +2843,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2833,7 +2866,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2842,14 +2875,14 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -3076,15 +3109,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Methwyd agor ffeil %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Methwyd agor ffeil %s" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/da.po b/po/da.po index 2ea472c4b..6cbe352fa 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2007-09-06 21:40+0200\n" "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n" "Language-Team: Danish\n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s oversat %s %s\n" @@ -531,26 +531,26 @@ msgstr "*** Kunne ikke l msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen p %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -655,7 +655,7 @@ msgstr "Kunne ikke omd msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" @@ -800,7 +800,7 @@ msgstr "Install msgid "Some packages could not be authenticated" msgstr "Nogle pakker kunne ikke autentificeres" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Der er problemer og -y blev brugt uden --force-yes" @@ -816,11 +816,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." @@ -849,25 +849,26 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikke nok ledig plads i %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ja, gr som jeg siger!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +879,28 @@ msgstr "" "For at fortstte, skal du skrive '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Afbryder." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,49 +908,49 @@ msgstr "" "Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' " "eller prv med --fix-missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og medieskift understttes endnu ikke" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Kunne ikke rette manglende pakker." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Afbryder installationen." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Bemrk, at %s vlges fremfor %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Overspringer %s, da den allerede er installeret og opgradering er " "deaktiveret.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installeret]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Du br eksplicit vlge en at installere." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -960,75 +961,86 @@ msgstr "" "anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n" "kun kan hentes fra andre kilder\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Dog kan flgende pakker erstatte den:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er i forvejen den nyeste version.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Udgaven '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versionen '%s' for '%s' blev ikke fundet" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Kunne ikke finde kildepakkelisten %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte " "AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Brug 'apt-get autoremove' til at fjerne dem." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,43 +1058,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover delagde noget" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Kunne ikke finde opgaven %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1090,7 +1102,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1101,115 +1113,115 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Du skal angive mindst n pakke at hente kildeteksten til" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plads i %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1217,7 +1229,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1226,32 +1238,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1335,7 +1347,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har \"Super Cow Powers\".\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1757,11 +1769,11 @@ msgid "File not found" msgstr "Fil blev ikke fundet" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Kunne ikke finde" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Kunne ikke angive ndringstidspunkt" @@ -1889,7 +1901,7 @@ msgstr "Tidsudl msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1964,8 +1976,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omstning af navnet '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2058,48 +2070,48 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Kunne ikke skrive filen %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Intern fejl" @@ -2107,18 +2119,25 @@ msgstr "Intern fejl" msgid "Can't mmap an empty file" msgstr "Kan ikke udfre mmap for en tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke udfre mmap for %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2504,7 +2523,14 @@ msgstr "Typen '%s' er ukendt p msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2516,6 +2542,13 @@ msgstr "" "id, men hvis du virkelig vil gre det, kan du aktivere valget 'APT::Force-" "LoopBreak'." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2726,21 +2759,21 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2749,7 +2782,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2758,13 +2791,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2993,14 +3026,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunne ikke pfre filen %s en lap" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen lukkedes for hurtigt" +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pfre filen %s en lap" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/de.po b/po/de.po index d733bfec5..898f28884 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-10-20 21:55+0200\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -155,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s für %s, kompiliert am %s %s\n" @@ -544,26 +544,26 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-Limit von %sB erreicht.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archiv hatte kein Paket-Feld" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-Betreuer ist %s und nicht %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" @@ -669,7 +669,7 @@ msgstr "%s konnte nicht in %s umbenannt werden" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" @@ -815,7 +815,7 @@ msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? " msgid "Some packages could not be authenticated" msgstr "Einige Pakete konnten nicht authentifiziert werden" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet" @@ -831,11 +831,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet." msgid "Internal error, Ordering didn't finish" msgstr "Interner Fehler, Anordnung beendete nicht" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -866,25 +866,26 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Sie haben nicht genug Platz in %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ja, tue was ich sage!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -895,28 +896,28 @@ msgstr "" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abbruch." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -924,49 +925,49 @@ msgstr "" "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get " "update« ausführen oder mit »--fix-missing« probieren?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Fehlende Pakete konnten nicht korrigiert werden." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Installation abgebrochen." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Hinweis: %s wird an Stelle von %s gewählt\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht " "gesetzt.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installiert]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Sie sollten eines explizit zum Installieren auswählen." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -977,61 +978,72 @@ msgstr "" "referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n" "ist oder nur aus einer anderen Quelle verfügbar ist.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Doch die folgenden Pakete ersetzen es:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s hat keinen Installationskandidaten" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Erneute Installation von %s ist nicht möglich,\n" "es kann nicht heruntergeladen werden.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ist schon die neueste Version.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version »%s« für »%s« konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n" +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Das Listenverzeichnis kann nicht gesperrt werden" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1039,17 +1051,17 @@ msgstr "" "Die folgenden Pakete wurden automatisch installiert und werden nicht länger " "benötigt:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1068,44 +1080,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "" "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Task %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1113,7 +1125,7 @@ msgstr "" "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " "jegliche Pakete (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1125,120 +1137,120 @@ msgstr "" "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" "erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Kaputte Pakete" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Berechne Upgrade (Paketaktualisierung) ..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden " "sollen" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Überspringe schon heruntergeladene Datei »%s«\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Sie haben nicht genug freien Platz in %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Quelle %s wird heruntergeladen\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n" "überprüft werden sollen." -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s hat keine Bau-Abhängigkeiten.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1247,7 +1259,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1256,32 +1268,32 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare " "Version des Pakets %s die Versionsanforderungen erfüllen kann." -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %" "s ist zu neu." -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1372,7 +1384,7 @@ msgstr "" "weitergehende Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1800,11 +1812,11 @@ msgstr "Datei nicht gefunden" # looks like someone hardcoded English grammar #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "»stat« konnte nicht ausgeführt werden." -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Änderungszeitpunkt kann nicht gesetzt werden" @@ -1934,7 +1946,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" @@ -2011,8 +2023,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" #: methods/connect.cc:240 @@ -2108,49 +2120,49 @@ msgstr "" msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Verbindung erlitt Zeitüberschreitung" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Fehler beim Schreiben einer Datei" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der " "anderen Seite geschlossen" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Datei konnte nicht eingekürzt werden" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Interner Fehler" @@ -2158,12 +2170,12 @@ msgstr "Interner Fehler" msgid "Can't mmap an empty file" msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "mmap von %lu Bytes konnte nicht durchgeführt werden" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2172,6 +2184,13 @@ msgstr "" "Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::" "Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2561,7 +2580,14 @@ msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2573,6 +2599,13 @@ msgstr "" "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte " "die Option APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2797,20 +2830,20 @@ msgstr "E/A-Fehler beim Speichern des Quell-Caches" msgid "rename failed, %s (%s -> %s)." msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2820,7 +2853,7 @@ msgstr "" "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " "Architektur)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2829,14 +2862,14 @@ msgstr "" "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " "Sie dieses Paket von Hand korrigieren müssen." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" @@ -3075,10 +3108,26 @@ msgstr "" msgid "Not locked" msgstr "Nicht gesperrt" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Datei konnte nicht gepatcht werden" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" + +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n" + +#~ msgid "Could not patch file" +#~ msgstr "Datei konnte nicht gepatcht werden" diff --git a/po/dz.po b/po/dz.po index 63041349a..5b9d0f73e 100644 --- a/po/dz.po +++ b/po/dz.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2006-09-19 09:49+0530\n" "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n" "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n" @@ -157,7 +157,7 @@ msgstr "%4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n" @@ -537,26 +537,26 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད msgid " DeLink limit of %sB hit.\n" msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" @@ -660,7 +660,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི msgid "Y" msgstr "ཝའི།" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -805,7 +805,7 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི msgid "Some packages could not be authenticated" msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།" @@ -823,11 +823,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" @@ -858,25 +858,26 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -887,28 +888,28 @@ msgstr "" "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "བར་བཤོལ་འབད།" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -916,49 +917,49 @@ msgstr "" "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་ apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-" "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s་གོམ་འགྱོ་འབད་དོ་ འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་" "འབད་བས།\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་ འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [གཞི་བཙུགས་འབད་ཡོད།]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -969,74 +970,85 @@ msgstr "" "འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་ ཡང་ན་\n" "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1052,44 +1064,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1097,7 +1109,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1108,122 +1120,122 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1232,32 +1244,32 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1344,7 +1356,7 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1765,11 +1777,11 @@ msgid "File not found" msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1897,7 +1909,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1972,8 +1984,8 @@ msgid "Temporary failure resolving '%s'" msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།" #: methods/connect.cc:240 @@ -2067,48 +2079,48 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -2116,18 +2128,25 @@ msgstr "ནང་འཁོད་འཛོལ་བ།" msgid "Can't mmap an empty file" msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2515,7 +2534,14 @@ msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་ག msgid "Malformed line %u in source list %s (vendor id)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2527,6 +2553,13 @@ msgstr "" "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་" "ལྡན་བཟོ།" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2737,20 +2770,20 @@ msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མ msgid "rename failed, %s (%s -> %s)." msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2759,7 +2792,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2768,14 +2801,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -3004,15 +3037,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/el.po b/po/el.po index bdf31ba1a..501849a00 100644 --- a/po/el.po +++ b/po/el.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-08-26 18:25+0300\n" "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -163,7 +163,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" @@ -545,26 +545,26 @@ msgstr " Αποτυχία σύνδεσης του %s με το %s" msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" @@ -668,7 +668,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -815,7 +815,7 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ msgid "Some packages could not be authenticated" msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Υπάρχουν προβλήματα και δώσατε -y χωρίς το --force-yes" @@ -832,11 +832,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -868,25 +868,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ναι, κανε ότι λέω!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -897,28 +898,28 @@ msgstr "" "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Εγκατάλειψη." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -926,49 +927,49 @@ msgstr "" "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update " "ή το --fix-missing;" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Αδύνατη η επίλυση των χαμένων πακέτων." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Εγκατάλειψη της εγκατάστασης." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Εγκατεστημένα]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -980,76 +981,87 @@ msgstr "" "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο " "από άλλη πηγή\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή " "του\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "το %s είναι ήδη η τελευταία έκδοση.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Η έκδοση %s για το %s δεν βρέθηκε" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1067,43 +1079,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1111,7 +1123,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1123,120 +1135,120 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1244,7 +1256,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1253,32 +1265,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1361,7 +1373,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1782,11 +1794,11 @@ msgid "File not found" msgstr "Το αρχείο Δε Βρέθηκε" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Αποτυχία εύρεσης της κατάστασης" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1914,7 +1926,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1989,8 +2001,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2084,49 +2096,49 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2134,18 +2146,25 @@ msgstr "Εσωτερικό Σφάλμα" msgid "Can't mmap an empty file" msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2536,7 +2555,14 @@ msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών % msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2548,6 +2574,13 @@ msgstr "" "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την " "επιλογή APT::Force-LoopBreak option." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2765,19 +2798,19 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ msgid "rename failed, %s (%s -> %s)." msgstr "απέτυχε η μετονομασία, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2786,7 +2819,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2795,7 +2828,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2803,7 +2836,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -3033,14 +3066,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Αδύνατη η διόρθωση του αρχείου" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Η σύνδεση έκλεισε πρόωρα" +#~ msgid "Could not patch file" +#~ msgstr "Αδύνατη η διόρθωση του αρχείου" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/en_GB.po b/po/en_GB.po index b2711ba21..4ee752427 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-13 11:47+0000\n" "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" "Language-Team: en_GB <en_gb@li.org>\n" @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s compiled on %s %s\n" @@ -524,26 +524,26 @@ msgstr "*** Failed to link %s to %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit of %sB hit.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" @@ -647,7 +647,7 @@ msgstr "Failed to rename %s to %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@ -792,7 +792,7 @@ msgstr "Install these packages without verification [y/N]? " msgid "Some packages could not be authenticated" msgstr "Some packages could not be authenticated" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "There are problems and -y was used without --force-yes" @@ -808,11 +808,11 @@ msgstr "Packages need to be removed but remove is disabled." msgid "Internal error, Ordering didn't finish" msgstr "Internal error, Ordering didn't finish" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." @@ -841,25 +841,26 @@ msgstr "After this operation, %sB of additional disk space will be used.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "After this operation, %sB disk space will be freed.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "You don't have enough free space in %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only specified but this is not a trivial operation." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -870,28 +871,28 @@ msgstr "" "To continue type in the phrase ‘%s’\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -899,47 +900,47 @@ msgstr "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing and media swapping is not currently supported" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Unable to correct missing packages." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Aborting install." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, selecting %s instead of %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Skipping %s, it is already installed and upgrade is not set.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Package %s is not installed, so not removed\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Package %s is a virtual package provided by:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installed]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "You should explicitly select one to install." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -950,58 +951,69 @@ msgstr "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "However the following packages replace it:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Package %s has no installation candidate" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is already the newest version.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version ‘%s’ for ‘%s’ was not found" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Couldn't stat source package list %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We are not supposed to delete stuff, cannot start AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1009,18 +1021,18 @@ msgstr "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' to remove them." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1038,43 +1050,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internal Error, AutoRemoved broke stuff" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Couldn't find task %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s set to manually installed.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "You might want to run 'apt-get -f install' to correct these:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1082,7 +1094,7 @@ msgstr "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1094,116 +1106,116 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Must specify at least one package for which to fetch source" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "You don't have enough free space in %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Need to get %sB/%sB of source archives.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Skipping unpack of already unpacked source in %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Check if the 'dpkg-dev' package is installed.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Must specify at least one package for which you want to check builddeps" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1212,7 +1224,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1221,31 +1233,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Failed to satisfy %s dependency for %s: Installed package %s is too new" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1330,7 +1342,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1746,11 +1758,11 @@ msgid "File not found" msgstr "File not found" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Failed to stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Failed to set modification time" @@ -1878,7 +1890,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1953,8 +1965,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" #: methods/connect.cc:240 @@ -2045,47 +2057,47 @@ msgstr "This HTTP server has broken range support" msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Failed to truncate file" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Internal error" @@ -2093,18 +2105,25 @@ msgstr "Internal error" msgid "Can't mmap an empty file" msgstr "Cannot mmap an empty file" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Couldn't make mmap of %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2490,7 +2509,14 @@ msgstr "Type ‘%s’ is not known on line %u in source list %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2501,6 +2527,13 @@ msgstr "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2709,19 +2742,19 @@ msgstr "IO Error saving source cache" msgid "rename failed, %s (%s -> %s)." msgstr "rename failed, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash Sum mismatch" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "There is no public key available for the following key IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2730,7 +2763,7 @@ msgstr "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2739,14 +2772,14 @@ msgstr "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "The package index files are corrupted. No Filename: field for package %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Size mismatch" @@ -2974,14 +3007,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connection closed prematurely" +#~ msgid "Could not patch file" +#~ msgstr "Could not patch file" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/es.po b/po/es.po index 1e8164676..9111e88a7 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-15 21:52+0100\n" "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -155,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado en %s %s\n" @@ -539,26 +539,26 @@ msgstr "*** No pude enlazar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al lmite de %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" @@ -662,7 +662,7 @@ msgstr "Fall msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" @@ -807,7 +807,7 @@ msgstr " msgid "Some packages could not be authenticated" msgstr "Algunos paquetes no se pueden autenticar" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Hay problemas y se utiliz -y sin --force-yes" @@ -823,11 +823,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "No se puede bloquear el directorio de descarga" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -859,25 +859,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de esta operacin.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "No tiene suficiente espacio libre en %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Se especific Trivial Only pero sta no es una operacin trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "S, haga lo que le digo!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -888,28 +889,28 @@ msgstr "" "Para continuar escriba la frase %s\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -917,47 +918,47 @@ msgstr "" "No se pudieron obtener algunos archivos, quizs deba ejecutar\n" "apt-get update o deba intentarlo de nuevo con --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "No se pudieron corregir los paquetes que faltan." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Abortando la instalacin." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, seleccionando %s en lugar de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "El paquete %s no esta instalado, no se eliminar\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "El paquete %s es un paquete virtual provisto por:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Necesita seleccionar explcitamente uno para instalar." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -968,59 +969,70 @@ msgstr "" "a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n" "encuentra disponible desde alguna otra fuente\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Sin embargo, los siguientes paquetes lo reemplazan:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "El paquete %s no tiene candidato para su instalacin" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ya est en su versin ms reciente.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "No se encontr la Distribucin '%s' para '%s'" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "No se encontr la versin '%s' para '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versin seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "No se puede leer la lista de paquetes fuente %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Se supone que no vamos a eliminar cosas, no se pudo iniciar AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1028,18 +1040,18 @@ msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilice apt-get autoremove para eliminarlos." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1057,43 +1069,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, AutoRemover rompi cosas" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "No se pudo encontrar la tarea %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1101,7 +1113,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1113,119 +1125,119 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "No se pudo encontrar un paquete de fuentes para %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Necesito descargar %sB/%sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Compruebe que el paquete dpkg-dev est instalado.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1234,7 +1246,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1243,32 +1255,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es " "demasiado nuevo" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "No se pudo satisfacer la dependencia %s para %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1354,7 +1366,7 @@ msgstr "" "para ms informacin y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1777,11 +1789,11 @@ msgid "File not found" msgstr "Fichero no encontrado" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "No pude leer" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "No pude poner el tiempo de modificacin" @@ -1909,7 +1921,7 @@ msgstr "Expir msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1984,8 +1996,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo raro pas resolviendo '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2078,47 +2090,47 @@ msgstr " msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Fall al truncar el archivo" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Error interno" @@ -2126,18 +2138,25 @@ msgstr "Error interno" msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vaco" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "No pude hacer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2527,7 +2546,14 @@ msgstr "Tipo '%s' desconocido en la l msgid "Malformed line %u in source list %s (vendor id)" msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2539,6 +2565,13 @@ msgstr "" "Esto generalmente es malo, pero si realmente quiere hacerlo, active \n" "la opcin APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2758,21 +2791,21 @@ msgstr "Error de E/S guardando cach msgid "rename failed, %s (%s -> %s)." msgstr "fall el cambio de nombre, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "La suma MD5 difiere" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pblica disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2782,7 +2815,7 @@ msgstr "" "que necesita arreglar manualmente este paquete (debido a que falta una " "arquitectura)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2791,7 +2824,7 @@ msgstr "" "No se pudo localizar un archivo para el paquete %s. Esto puede significar " "que necesita arreglar manualmente este paquete." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2799,7 +2832,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "El tamao difiere" @@ -3033,14 +3066,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "No pude parchear el fichero" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "La conexin se cerr prematuramente" +#~ msgid "Could not patch file" +#~ msgstr "No pude parchear el fichero" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/eu.po b/po/eu.po index db988ebed..c899df2b2 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-05-17 00:41+0200\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" @@ -155,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n" @@ -527,26 +527,26 @@ msgstr "*** Ezin izan da %s %s(r)ekin estekatu" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-en mugara (%sB) heldu da.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" @@ -650,7 +650,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -795,7 +795,7 @@ msgstr "Paketeak egiaztapen gabe instalatu [b/E]? " msgid "Some packages could not be authenticated" msgstr "Zenbait pakete ezin dira egiaztatu" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Arazoak daude, eta -y erabili da --force-yes gabe" @@ -811,11 +811,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago." msgid "Internal error, Ordering didn't finish" msgstr "Barne errorea, ez da ordenatzeaz amaitu" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Ezin izan da Iturburu zerrenda irakurri." @@ -846,25 +846,26 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Bai, egin esandakoa!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -875,28 +876,28 @@ msgstr "" "Jarraitzeko, idatzi '%s' esaldia\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abortatu." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -904,47 +905,47 @@ msgstr "" "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo " "--fix-missing aukerarekin saiatu?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Falta diren paketeak ezin dira zuzendu." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Abortatu instalazioa." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Oharra, %s hautatzen %s(r)en ordez\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s pakete birtual bat da, honek hornitua:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalatuta]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Zehazki bat hautatu behar duzu instalatzeko." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -955,58 +956,69 @@ msgstr "" "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n" "beste iturburu batean bakarrik egongo da erabilgarri\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Baina ondorengo paketeek ordezten dute:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "%s paketeak ez du instalatzeko hautagairik" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s bertsiorik berriena da jada.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda direktorioa blokeatu" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1014,18 +1026,18 @@ msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1043,43 +1055,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Ezin izan da %s zeregina aurkitu" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1087,7 +1099,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1099,117 +1111,117 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Ez daukazu nahikoa leku libre %s(e)n." -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1217,7 +1229,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1226,32 +1238,32 @@ msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak " "betetzen dituen %3$s paketearen bertsio erabilgarririk" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s " "paketea berriegia da" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1336,7 +1348,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1755,11 +1767,11 @@ msgid "File not found" msgstr "Ez da fitxategia aurkitu" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Huts egin du atzitzean" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Huts egin du aldaketa ordua ezartzean" @@ -1890,7 +1902,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1966,8 +1978,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean" #: methods/connect.cc:240 @@ -2057,47 +2069,47 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Huts fitxategia mozterakoan" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Barne errorea" @@ -2105,12 +2117,12 @@ msgstr "Barne errorea" msgid "Can't mmap an empty file" msgstr "Ezin da fitxategi huts baten mmap egin" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ezin izan da %lu byteren mmap egin" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2119,6 +2131,13 @@ msgstr "" "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko " "balioa: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2508,7 +2527,14 @@ msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2520,6 +2546,13 @@ msgstr "" "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak " "aukera." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2727,19 +2760,19 @@ msgstr "S/I errorea iturburu katxea gordetzean" msgid "rename failed, %s (%s -> %s)." msgstr "huts egin du izen-aldaketak, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum ez dator bat" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2748,7 +2781,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea. (arkitektura falta delako)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2757,7 +2790,7 @@ msgstr "" "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu " "beharko duzu paketea." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2765,7 +2798,7 @@ msgstr "" "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s " "paketearentzat." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2996,14 +3029,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Ezin izan zaio fitxategiari adabakia ezarri" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Konexioa behar baino lehenago itxi da" +#~ msgid "Could not patch file" +#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/fi.po b/po/fi.po index a8b4ff6f8..a67aa2b7e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-12-11 14:52+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n" @@ -528,26 +528,26 @@ msgstr "*** Linkin %s -> %s luonti ei onnistunut" msgid " DeLink limit of %sB hit.\n" msgstr " DeLinkin yläraja %st saavutettu.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" @@ -651,7 +651,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -796,7 +796,7 @@ msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? " msgid "Some packages could not be authenticated" msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes" @@ -812,11 +812,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä." msgid "Internal error, Ordering didn't finish" msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@ -846,26 +846,27 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Kyllä, tee kuten käsketään!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -876,28 +877,28 @@ msgstr "" "Jatka kirjoittamalla \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Keskeytä." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -905,47 +906,47 @@ msgstr "" "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai " "kokeile --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Puuttuvia paketteja ei voi korjata." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Asennus keskeytetään." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Huomautus, valitaan %s eikä %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Asennettu]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Yksi pitää valita asennettavaksi." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -956,59 +957,70 @@ msgstr "" "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n" "saatavilla vain jostain muusta lähteestä\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Seuraavat paketit kuitenkin korvaavat sen:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketilla %s ei ole asennettavaa valintaa" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s on jo uusin versio.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "stat ei toiminut lähdepakettiluettelolle %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1016,18 +1028,18 @@ msgstr "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Poista ne komennolla \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1045,43 +1057,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Tehtävää %s ei löytynyt" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1101,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1100,116 +1112,116 @@ msgstr "" "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n" "vielä luotu tai siirretty Incoming-kansiosta." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1217,7 +1229,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1226,32 +1238,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian " "uusi" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1335,7 +1347,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1755,11 +1767,11 @@ msgid "File not found" msgstr "Tiedostoa ei löydy" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Komento stat ei toiminut" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua" @@ -1887,7 +1899,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1962,8 +1974,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)" #: methods/connect.cc:240 @@ -2056,47 +2068,47 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Tiedoston typistäminen ei onnistunut" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2104,18 +2116,25 @@ msgstr "Sisäinen virhe" msgid "Can't mmap an empty file" msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ei voitu tehdä %lu tavun mmap:ia" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2501,7 +2520,14 @@ msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2512,6 +2538,13 @@ msgstr "" "s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta " "jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2720,19 +2753,19 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" msgid "rename failed, %s (%s -> %s)." msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum ei täsmää" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash Sum täsmää" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2741,7 +2774,7 @@ msgstr "" "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan " "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2750,7 +2783,7 @@ msgstr "" "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan " "tämän paketin itse." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2758,7 +2791,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2990,14 +3023,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Tiedostoa %s ei voitu avata" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Yhteys katkesi ennenaikaisesti" +#~ msgid "Could not patch file" +#~ msgstr "Tiedostoa %s ei voitu avata" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/fr.po b/po/fr.po index 9a15143be..4742421ca 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-09-27 19:36+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -154,7 +154,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pour %s compilé sur %s %s\n" @@ -537,26 +537,26 @@ msgstr "*** Impossible de lier %s à %s" msgid " DeLink limit of %sB hit.\n" msgstr " Seuil de delink de %so atteint.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "L'archive ne possède pas de champ de paquet" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr "%s ne possède pas d'entrée « override »\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " le responsable de %s est %s et non %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s ne possède pas d'entrée « source override »\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ne possède pas également pas d'entrée « binary override »\n" @@ -660,7 +660,7 @@ msgstr "Impossible de changer le nom %s en %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Erreur de compilation de l'expression rationnelle - %s" @@ -806,7 +806,7 @@ msgstr "Faut-il installer ces paquets sans vérification (o/N) ? " msgid "Some packages could not be authenticated" msgstr "Certains paquets n'ont pas pu être authentifiés" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Il y a des problèmes et -y a été employé sans --force-yes" @@ -823,11 +823,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Erreur interne. Le tri a été interrompu." -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Impossible de verrouiller le répertoire de téléchargement" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "La liste des sources ne peut être lue." @@ -859,17 +859,18 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Après cette opération, %so d'espace disque seront libérés.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Impossible de déterminer l'espace disponible sur %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération " @@ -877,11 +878,11 @@ msgstr "" # The space before the exclamation mark must not be a non-breaking space; this # sentence is supposed to be typed by a user who cannot see the difference. -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Oui, faites ce que je vous dis !" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -892,28 +893,28 @@ msgstr "" "Pour continuer, tapez la phrase « %s »\n" " ?]" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Annulation." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Souhaitez-vous continuer [O/n] ? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Impossible de récupérer %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Certains fichiers n'ont pu être téléchargés." -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Téléchargement achevé et dans le mode téléchargement uniquement" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -921,48 +922,48 @@ msgstr "" "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-" "get update ou essayer avec --fix-missing ?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "l'option --fix-missing et l'échange de support ne sont pas encore reconnus." -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Impossible de corriger le fait que les paquets manquent." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Annulation de l'installation." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, sélection de %s au lieu de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Le paquet %s est un paquet virtuel fourni par :\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installé]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Vous devez explicitement sélectionner un paquet à installer." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -974,61 +975,72 @@ msgstr "" "devenu obsolète\n" "ou qu'il n'est disponible que sur une autre source\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Cependant les paquets suivants le remplacent :" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Aucun paquet ne correspond au paquet %s" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s est déjà la plus récente version disponible.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "La version « %s » de « %s » est introuvable" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "La version « %s » de « %s » n'a pu être trouvée" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Version choisie %s (%s) pour %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 #, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n" +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1307 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Impossible de localiser la liste des paquets sources %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "La commande de mise à jour ne prend pas d'argument" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Impossible de verrouiller le répertoire de liste" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Aucune suppression n'est sensée se produire : impossible de lancer " "« Autoremover »" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1036,17 +1048,17 @@ msgstr "" "Les paquets suivants ont été installés automatiquement et ne sont plus " "nécessaires :" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1065,44 +1077,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "L'information suivante devrait vous aider à résoudre la situation : " -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "" "Erreur interne, l'outil de suppression automatique a cassé quelque chose." -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erreur interne, AllUpgrade a cassé le boulot !" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Impossible de trouver la tâche %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Impossible de trouver le paquet %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s passé en « installé manuellement ».\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1110,7 +1122,7 @@ msgstr "" "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n" "(ou indiquez une solution)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1122,119 +1134,119 @@ msgstr "" "la distribution unstable, que certains paquets n'ont pas encore\n" "été créés ou ne sont pas sortis d'Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Paquets défectueux" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Les paquets supplémentaires suivants seront installés : " -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Paquets suggérés :" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Paquets recommandés :" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Calcul de la mise à jour... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Échec" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Fait" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" "Erreur interne, la tentative de résolution du problème a cassé certaines " "parties" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Vous devez spécifier au moins un paquet source" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossible de trouver une source de paquet pour %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Pas assez d'espace disponible sur %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Nécessité de prendre %so/%so dans les sources.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Nécessité de prendre %so dans les sources.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Récupération des sources %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Échec lors de la récupération de quelques archives." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "La commande de décompactage « %s » a échoué.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "La commande de construction « %s » a échoué.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Échec du processus fils" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Il faut spécifier au moins un paquet pour vérifier les dépendances de " "construction" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossible d'obtenir les dépendances de construction pour %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s n'a pas de dépendance de construction.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1243,7 +1255,7 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne " "peut être trouvé" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1252,32 +1264,33 @@ msgstr "" "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version " "du paquet %s ne peut satisfaire à la version requise" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s " "est trop récent" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites." +msgstr "" +"Les dépendances de compilation pour %s ne peuvent pas être satisfaites." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Impossible d'activer les dépendances de construction" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Modules reconnus :" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1362,7 +1375,7 @@ msgstr "" "apt.conf(5) pour plus d'informations et d'option.\n" " Cet APT a les « Super Cow Powers »\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1793,11 +1806,11 @@ msgid "File not found" msgstr "Fichier non trouvé" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Impossible de statuer" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Impossible de modifier l'heure " @@ -1927,7 +1940,7 @@ msgstr "Délai de connexion au port de données dépassé" msgid "Unable to accept connection" msgstr "Impossible d'accepter une connexion" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problème de hachage du fichier" @@ -2002,13 +2015,14 @@ msgid "Temporary failure resolving '%s'" msgstr "Erreur temporaire de résolution de « %s »" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" "Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%" "s » (%i)" -#: methods/connect.cc:240, c-format +#: methods/connect.cc:240 +#, c-format msgid "Unable to connect to %s:%s:" msgstr "Impossible de se connecter à %s:%s :" @@ -2099,47 +2113,47 @@ msgstr "Ce serveur http possède un support des limites non-valide" msgid "Unknown date format" msgstr "Format de date inconnu" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Sélection défaillante" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Délai de connexion dépassé" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Erreur d'écriture du fichier de sortie" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Erreur d'écriture sur un fichier" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Erreur d'écriture sur le fichier" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Erreur de lecture du serveur" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Échec de la troncature du fichier" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Mauvais en-tête de donnée" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Échec de la connexion" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Erreur interne" @@ -2147,12 +2161,12 @@ msgstr "Erreur interne" msgid "Can't mmap an empty file" msgstr "Impossible de mapper un fichier vide en mémoire" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Impossible de réaliser un mapping de %lu octets en mémoire" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2162,6 +2176,13 @@ msgstr "" "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur " "actuelle est de %lu (voir « man 5 apt.conf »)." +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2552,7 +2573,14 @@ msgid "Malformed line %u in source list %s (vendor id)" msgstr "" "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2564,6 +2592,13 @@ msgstr "" "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement " "le faire, activez l'option APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2792,19 +2827,20 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "impossible de changer le nom, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Somme de contrôle MD5 incohérente" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Somme de contrôle de hachage incohérente" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" -msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" +msgstr "" +"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2813,7 +2849,7 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même (absence d'architecture)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2822,7 +2858,7 @@ msgstr "" "Impossible de localiser un fichier du paquet %s. Cela signifie que vous " "devrez corriger ce paquet vous-même." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2830,7 +2866,7 @@ msgstr "" "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » " "pour le paquet %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Taille incohérente" @@ -3070,14 +3106,30 @@ msgstr "" msgid "Not locked" msgstr "Non verrouillé" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Impossible de corriger le fichier" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Connexion fermée prématurément" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n" + +#~ msgid "Could not patch file" +#~ msgstr "Impossible de corriger le fichier" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/gl.po b/po/gl.po index 75547f896..656e696c5 100644 --- a/po/gl.po +++ b/po/gl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-12-17 22:44+0100\n" "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n" "Language-Team: galician <proxecto@trasno.net>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado o %s %s\n" @@ -539,26 +539,26 @@ msgstr "*** Non se puido ligar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzouse o límite de desligado de %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s non ten unha entrada de \"override\" de código fonte\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n" @@ -662,7 +662,7 @@ msgstr "Non se puido cambiar o nome de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" @@ -807,7 +807,7 @@ msgstr "¿Instalar estes paquetes sen verificación [s/N]? " msgid "Some packages could not be authenticated" msgstr "Non se puido autenticar algúns paquetes" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Houbo problemas e empregouse -y sen --force-yes" @@ -823,11 +823,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Non se puido bloquear o directorio de descargas" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." @@ -857,25 +857,26 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Despois desta operación hanse liberar %sB de disco.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Non hai espazo libre de abondo en %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "¡Si, fai o que digo!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -886,28 +887,28 @@ msgstr "" "Para continuar escriba a frase \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -915,49 +916,49 @@ msgstr "" "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-" "missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "O emprego conxunto de --fix-missing e intercambio de discos non está " "soportado" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Non se puido corrixir os paquetes non dispoñibles." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "A abortar a instalación." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, escóllese %s no canto de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O paquete %s non está instalado, así que non se eliminou\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O paquete %s é un paquete virtual fornecido por:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Debería escoller un para instalar." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -968,77 +969,88 @@ msgstr "" "Isto pode significar que o paquete falla, está obsoleto ou só está\n" "dispoñible noutra fonte.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Nembargantes, os seguintes paquetes substitúeno:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "O paquete %s non ten un candidato para a instalación" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalación de %s non é posible, non se pode descargar.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s xa é a versión máis recente.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Non se atopou a versión \"%s\" de \"%s\"" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Non se atopou a lista de paquetes fonte %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Non se supón que se deban eliminar cousas; non se pode iniciar o " "autoeliminador" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empregue \"apt-get autoremove\" para eliminalos." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1056,43 +1068,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro interno, o autoeliminador rompeu cousas" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Non se puido atopar a tarefa %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiouse a instalado manualmente.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1100,7 +1112,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1111,118 +1123,118 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1243,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1252,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1353,7 +1365,7 @@ msgstr "" "máis información e opcións.\n" " Este APT ten Poderes de Supervaca.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1771,11 +1783,11 @@ msgid "File not found" msgstr "Non se atopou o ficheiro" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Non se atopou" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Non se puido estabrecer a hora de modificación" @@ -1904,7 +1916,7 @@ msgstr "A conexión do socket de datos esgotou o tempo" msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1979,8 +1991,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal ao resolver \"%s\"" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)" #: methods/connect.cc:240 @@ -2075,47 +2087,47 @@ msgstr "Este servidor HTTP ten un soporte de rangos roto" msgid "Unknown date format" msgstr "Formato de data descoñecido" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Non se puido truncar o ficheiro" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Erro interno" @@ -2123,18 +2135,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Non se pode facer mmap sobre un ficheiro baleiro" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Non se puido facer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2521,7 +2540,14 @@ msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2532,6 +2558,13 @@ msgstr "" "%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, " "pero se o quere facer, active a opción APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2743,20 +2776,20 @@ msgstr "Erro de E/S ao gravar a caché de fontes" msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Os MD5Sum non coinciden" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Os \"hashes\" non coinciden" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2765,7 +2798,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2774,7 +2807,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2782,7 +2815,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -3014,14 +3047,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Non se puido parchear o ficheiro" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" +#~ msgid "Could not patch file" +#~ msgstr "Non se puido parchear o ficheiro" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/hu.po b/po/hu.po index 78a5f0298..9bd8920b5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-05-11 14:49+0100\n" "Last-Translator: SZERVÁC Attila <sas@321.hu>\n" "Language-Team: Hungarian <debian-l10n-hungarian>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s erre: %s ekkor fordult: %s %s\n" @@ -532,26 +532,26 @@ msgstr "*** %s linkelése ehhez: %s sikertelen" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s nem rendelkezik forrás felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n" @@ -655,7 +655,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -800,7 +800,7 @@ msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? " msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesíthető" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" @@ -816,11 +816,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze msgid "Internal error, Ordering didn't finish" msgstr "Belső hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Nem tudom zárolni a letöltési könyvtárat" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -849,25 +849,26 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "E művelet után %sB lemez-terület szabadul fel.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +879,28 @@ msgstr "" "A folytatáshoz írd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Megszakítva." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,47 +908,47 @@ msgstr "" "Nem lehet letölteni néhány archívumot.\n" " Próbáld ki az apt-get update -et vagy a --fix-missing -et." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing és média csere jelenleg nem támogatott" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Nem lehet javítani a hiányzó csomagokat." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Telepítés megszakítása." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Megjegyzés: %s kiválasztása %s helyett\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Telepítve]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -957,73 +958,84 @@ msgstr "" "%s csomag nem elérhető, de egy másik hivatkozik rá\n" ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "De az alábbi csomagok felváltják:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s már a legújabb verzió.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' kiadás ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' verzió ehhez: '%s' nem található" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nincs törölnivaló, az AutoRemover nem indítható" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Töröld az 'apt-get autoremove' paranccsal!" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1041,43 +1053,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, az AutoRemover sérült" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Hiányzó %s feladat" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésre állított.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1085,7 +1097,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1097,118 +1109,118 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrás-archívumot kell letölteni.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1217,7 +1229,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1226,32 +1238,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verzió-követelményt kielégítő elérhető verziója." -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1336,7 +1348,7 @@ msgstr "" "további információkért és opciókért.\n" " Ez az APT a SzuperTehén Hatalmával rendelkezik.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1751,11 +1763,11 @@ msgid "File not found" msgstr "Nem találom a fájlt" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Nem érhető el" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "A módosítási időt beállítása sikertelen" @@ -1883,7 +1895,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1958,8 +1970,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" #: methods/connect.cc:240 @@ -2048,48 +2060,48 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat " msgid "Unknown date format" msgstr "Ismeretlen dátum formátum" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "%s fájl írása sikertelen" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Belső hiba" @@ -2098,18 +2110,25 @@ msgstr "Belső hiba" msgid "Can't mmap an empty file" msgstr "Nem lehet mmap-olni egy üres fájlt" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nem sikerült %lu bájtot mmap-olni" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2496,7 +2515,14 @@ msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2507,6 +2533,13 @@ msgstr "" "alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, " "de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2722,19 +2755,19 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2743,7 +2776,7 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2752,14 +2785,14 @@ msgstr "" "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2987,14 +3020,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "%s fájl foltozása sikertelen" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A kapcsolat idő előtt lezárult" +#~ msgid "Could not patch file" +#~ msgstr "%s fájl foltozása sikertelen" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/it.po b/po/it.po index 46fbf62af..753347ad0 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-12-10 16:49+0100\n" "PO-Revision-Date: 2009-11-11 21:10+0100\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" @@ -1135,7 +1135,7 @@ msgstr "Pacchetti raccomandati:" msgid "Calculating upgrade... " msgstr "Calcolo dell'aggiornamento... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Non riuscito" @@ -1614,7 +1614,7 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 +#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" @@ -1795,34 +1795,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI non valido, gli URI locali non devono iniziare con //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:167 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "Accesso in corso" -#: methods/ftp.cc:173 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "Impossibile determinare il nome del nodo" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "Impossibile determinare il nome locale" -#: methods/ftp.cc:209 methods/ftp.cc:237 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "Il server ha rifiutato la connessione e riporta: %s" -#: methods/ftp.cc:215 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "USER non riuscito, il server riporta: %s" -#: methods/ftp.cc:222 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS non riuscito, il server riporta: %s" -#: methods/ftp.cc:242 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -1830,115 +1830,115 @@ msgstr "" "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::" "ftp::ProxyLogin è vuoto." -#: methods/ftp.cc:270 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "" "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s" -#: methods/ftp.cc:296 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE non riuscito, il server riporta: %s" -#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "Connessione scaduta" -#: methods/ftp.cc:340 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "Il server ha chiuso la connessione" -#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "Errore di lettura" -#: methods/ftp.cc:350 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "Una risposta ha superato le dimensioni del buffer." -#: methods/ftp.cc:367 methods/ftp.cc:379 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "Protocollo danneggiato" -#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "Errore di scrittura" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Impossibile creare un socket" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Impossibile connettersi al socket dati, connessione terminata" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "Impossibile connettere socket passivo." -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Impossibile eseguire bind() su un socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Impossibile eseguire listen() su un socket" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Impossibile determinare il nome del socket" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Impossibile inviare il comando PORT" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT non riuscito, il server riporta: %s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Connessione al socket dati terminata" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Impossibile accettare connessioni" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Si è verificato un problema nel creare l'hash del file" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Impossibile recuperare il file, il server riporta: \"%s\"" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Socket dati terminato" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\"" #. Get the files information -#: methods/ftp.cc:1002 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Interrogazione" -#: methods/ftp.cc:1114 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Impossibile invocare " @@ -2053,80 +2053,80 @@ msgstr "Impossibile aprire una pipe per %s" msgid "Read error from %s process" msgstr "Errore di lettura dal processo %s" -#: methods/http.cc:384 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "In attesa degli header" -#: methods/http.cc:530 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "Ricevuta una singola riga header su %u caratteri" -#: methods/http.cc:538 +#: methods/http.cc:539 msgid "Bad header line" msgstr "Riga header non corretta" -#: methods/http.cc:557 methods/http.cc:564 +#: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "Il server HTTP ha inviato un header di risposta non valido" -#: methods/http.cc:593 +#: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "Il server HTTP ha inviato un header Content-Length non valido" -#: methods/http.cc:608 +#: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "Il server HTTP ha inviato un header Content-Range non valido" -#: methods/http.cc:610 +#: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "Questo server HTTP ha un supporto del range non corretto" -#: methods/http.cc:634 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "Formato della data sconosciuto" -#: methods/http.cc:787 +#: methods/http.cc:790 msgid "Select failed" msgstr "Select non riuscita" -#: methods/http.cc:792 +#: methods/http.cc:795 msgid "Connection timed out" msgstr "Connessione terminata" -#: methods/http.cc:815 +#: methods/http.cc:818 msgid "Error writing to output file" msgstr "Errore nello scrivere sul file di output" -#: methods/http.cc:846 +#: methods/http.cc:849 msgid "Error writing to file" msgstr "Errore nello scrivere su file" -#: methods/http.cc:874 +#: methods/http.cc:877 msgid "Error writing to the file" msgstr "Errore nello scrivere sul file" -#: methods/http.cc:888 +#: methods/http.cc:891 msgid "Error reading from server. Remote end closed connection" msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione" -#: methods/http.cc:890 +#: methods/http.cc:893 msgid "Error reading from server" msgstr "Errore nel leggere dal server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" msgstr "Troncamento del file non riuscito" -#: methods/http.cc:1146 +#: methods/http.cc:1149 msgid "Bad header data" msgstr "Header dati non corretto" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1166 methods/http.cc:1221 msgid "Connection failed" msgstr "Connessione non riuscita" -#: methods/http.cc:1310 +#: methods/http.cc:1313 msgid "Internal error" msgstr "Errore interno" @@ -2538,7 +2538,7 @@ msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "La riga %u nel file %s non è corretta (vendor id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:439 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2621,12 +2621,12 @@ msgstr "Il metodo %s non si è avviato correttamente" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio." -#: apt-pkg/init.cc:132 +#: apt-pkg/init.cc:133 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Il sistema di pacchetti \"%s\" non è supportato" -#: apt-pkg/init.cc:148 +#: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti" @@ -2944,78 +2944,98 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" "Scritti %i record con %i file mancanti e %i file senza corrispondenze\n" +#: apt-pkg/indexcopy.cc:530 +#, fuzzy, c-format +msgid "Skipping nonexistent file %s" +msgstr "Apertura file di configurazione %s" + +#: apt-pkg/indexcopy.cc:536 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:542 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Somma hash non corrispondente" + #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" msgstr "Installazione di %s" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" msgstr "Configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" #: apt-pkg/deb/dpkgpm.cc:52 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Pacchetto %s rimosso completamente" + +#: apt-pkg/deb/dpkgpm.cc:53 #, c-format msgid "Running post-installation trigger %s" msgstr "Esecuzione comando di post installazione %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:558 #, c-format msgid "Directory '%s' missing" msgstr "Directory \"%s\" mancante" -#: apt-pkg/deb/dpkgpm.cc:653 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing %s" msgstr "Preparazione di %s" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Unpacking %s" msgstr "Estrazione di %s" -#: apt-pkg/deb/dpkgpm.cc:659 +#: apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Preparing to configure %s" msgstr "Preparazione alla configurazione di %s" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Installed %s" msgstr "Pacchetto %s installato" -#: apt-pkg/deb/dpkgpm.cc:666 +#: apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Preparing for removal of %s" msgstr "Preparazione alla rimozione di %s" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Removed %s" msgstr "Pacchetto %s rimosso" -#: apt-pkg/deb/dpkgpm.cc:673 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Preparing to completely remove %s" msgstr "Preparazione alla rimozione completa di %s" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Completely removed %s" msgstr "Pacchetto %s rimosso completamente" -#: apt-pkg/deb/dpkgpm.cc:878 +#: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non " "è montato)\n" -#: apt-pkg/deb/dpkgpm.cc:907 +#: apt-pkg/deb/dpkgpm.cc:908 msgid "Running dpkg" msgstr "Esecuzione di dpkg" diff --git a/po/ja.po b/po/ja.po index 2b96e7b96..e164d8599 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-13 09:26+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s コンパイル日時: %s %s\n" @@ -528,26 +528,26 @@ msgstr "*** %s を %s にリンクするのに失敗しました" msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" @@ -651,7 +651,7 @@ msgstr "%s を %s に名前変更できませんでした" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -798,7 +798,7 @@ msgstr "検証なしにこれらのパッケージをインストールします msgid "Some packages could not be authenticated" msgstr "いくつかのパッケージを認証できませんでした" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました" @@ -814,11 +814,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" @@ -848,25 +848,26 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "%s に充分な空きスペースがありません。" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +878,28 @@ msgstr "" "続行するには、'%s' というフレーズをタイプしてください。\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "中断しました。" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,49 +907,49 @@ msgstr "" "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-" "missing オプションを付けて試してみてください。" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "足りないパッケージを直すことができません。" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "インストールを中断します。" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意、%2$s の代わりに %1$s を選択します\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ" "プします。\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "パッケージ %s はインストールされていないため、削除はできません\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [インストール済み]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "インストールするパッケージを明示的に選択する必要があります。" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -959,76 +960,87 @@ msgstr "" "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n" "あるいは別のソースからのみしか利用できないという状況が考えられます\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "しかし、以下のパッケージで置き換えられています:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "パッケージ %s にはインストール候補がありません" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s はすでに最新バージョンです。\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "ソースパッケージリスト %s の状態を取得できません" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "これらを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,45 +1058,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "タスク %s が見つかりません" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1092,7 +1104,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1104,118 +1116,118 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1236,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1245,32 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ" "ケージは新しすぎます" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1347,7 +1359,7 @@ msgstr "" "apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1765,11 +1777,11 @@ msgid "File not found" msgstr "ファイルが見つかりません" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "状態の取得に失敗しました" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "変更時刻の設定に失敗しました" @@ -1897,7 +1909,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1972,8 +1984,8 @@ msgid "Temporary failure resolving '%s'" msgstr "'%s' が一時的に解決できません" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i) の解決中に問題が起こりました" #: methods/connect.cc:240 @@ -2064,47 +2076,47 @@ msgstr "http サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "ファイルの切り詰めに失敗しました" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "内部エラー" @@ -2112,18 +2124,25 @@ msgstr "内部エラー" msgid "Can't mmap an empty file" msgstr "空のファイルを mmap できません" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu バイトの mmap ができませんでした" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2509,7 +2528,14 @@ msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明 msgid "Malformed line %u in source list %s (vendor id)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2520,6 +2546,13 @@ msgstr "" "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に" "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2736,19 +2769,19 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし msgid "rename failed, %s (%s -> %s)." msgstr "名前の変更に失敗しました。%s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2757,7 +2790,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2766,7 +2799,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2774,7 +2807,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -3006,14 +3039,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "ファイルにパッチできませんでした" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "途中で接続がクローズされました" +#~ msgid "Could not patch file" +#~ msgstr "ファイルにパッチできませんでした" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/km.po b/po/km.po index 57d27886d..184ac5a57 100644 --- a/po/km.po +++ b/po/km.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2006-10-10 09:48+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n" @@ -532,26 +532,26 @@ msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n" @@ -655,7 +655,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុស​ការចងក្រង​ - %s" @@ -800,7 +800,7 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ msgid "Some packages could not be authenticated" msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes" @@ -816,11 +816,11 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច msgid "Internal error, Ordering didn't finish" msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។" @@ -849,25 +849,26 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +879,28 @@ msgstr "" "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "បោះបង់ ។" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,47 +908,47 @@ msgstr "" "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --" "fix- ដែលបាត់ឬ់ ?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [បានដំឡើង​]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -958,74 +959,85 @@ msgstr "" "វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n" "អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1041,51 +1053,51 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1097,122 +1109,122 @@ msgstr "" "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n" " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "កញ្ចប់​ដែល​បាន​ខូច​" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "បាន​បរាជ័យ" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "ធ្វើរួច​" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូល​ប្រភព​ %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ " -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1221,30 +1233,30 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​" "តម្រូវការ​កំណែបានឡើយ" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ " -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1327,7 +1339,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1741,11 +1753,11 @@ msgid "File not found" msgstr "រកឯកសារ​មិន​ឃើញ​" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "បរាជ័យ​ក្នុងការថ្លែង" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​" @@ -1872,7 +1884,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ" @@ -1947,8 +1959,8 @@ msgid "Temporary failure resolving '%s'" msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2036,48 +2048,48 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ msgid "Unknown date format" msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "ជ្រើស​បាន​បរាជ័យ​" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "ការតភ្ជាប់​បាន​អស់ពេល​" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "ទិន្នន័យ​បឋមកថា​ខូច" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "កំហុស​ខាង​ក្នុង​" @@ -2085,18 +2097,25 @@ msgstr "កំហុស​ខាង​ក្នុង​" msgid "Can't mmap an empty file" msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2483,7 +2502,14 @@ msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើប msgid "Malformed line %u in source list %s (vendor id)" msgstr "បន្ទាត់​ Malformed %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2494,6 +2520,13 @@ msgstr "" "ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::" "Force-LoopBreak សកម្ម ។" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2700,20 +2733,20 @@ msgstr "IO កំហុសក្នុងការររក្សាទុក​ msgid "rename failed, %s (%s -> %s)." msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិន​ផ្គួផ្គង​" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2722,7 +2755,7 @@ msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ " "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2730,13 +2763,13 @@ msgid "" msgstr "" "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​" @@ -2963,15 +2996,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/ko.po b/po/ko.po index a693560c4..66c5874f2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-13 07:14+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -149,7 +149,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" @@ -525,26 +525,26 @@ msgstr "*** %s 파일을 %s에 링크하는 데 실패했습니다" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" @@ -648,7 +648,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -794,7 +794,7 @@ msgstr "확인하지 않고 패키지를 설치하시겠습니까 [y/N]? " msgid "Some packages could not be authenticated" msgstr "인증할 수 없는 패키지가 있습니다" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "문제가 발생했고 -y 옵션이 --force-yes 옵션 없이 사용되었습니다" @@ -810,11 +810,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "다운로드 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@ -845,28 +845,29 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "%s 안에 충분한 여유 공간이 없습니다." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 " "아닙니다." # 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용. -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -877,28 +878,28 @@ msgstr "" "계속하시려면 다음 문구를 입력하십시오: '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "중단." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -906,48 +907,48 @@ msgstr "" "아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-" "missing 옵션을 줘서 실행해야 할 것입니다." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "빠진 패키지를 바로잡을 수 없습니다." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "설치를 중단합니다." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s 패키지는 다음 패키지가 제공하는 가상 패키지입니다:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [설치함]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "설치할 패키지를 하나 분명히 지정해야 합니다." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -958,73 +959,84 @@ msgstr "" "해당 패키지가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n" "패키지를 받아와야 하는 경우일 수도 있습니다.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "하지만 다음 패키지가 대체합니다:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "%s 패키지는 설치할 수 있는 후보가 없습니다" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s 패키지를 다시 설치하는 건 불가능합니다. 다운로드할 수 없습니다.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 패키지는 이미 최신 버전입니다.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 릴리즈를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1042,44 +1054,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "%s 작업를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1087,7 +1099,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1098,115 +1110,115 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "망가진 패키지" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1215,7 +1227,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1224,32 +1236,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너" "무 최근 버전입니다" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1333,7 +1345,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1749,11 +1761,11 @@ msgid "File not found" msgstr "파일이 없습니다" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "파일 정보를 읽는 데 실패했습니다" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1881,7 +1893,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1956,8 +1968,8 @@ msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)" #: methods/connect.cc:240 @@ -2047,47 +2059,47 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "파일을 자르는 데 실패했습니다" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "내부 오류" @@ -2095,18 +2107,25 @@ msgstr "내부 오류" msgid "Can't mmap an empty file" msgstr "빈 파일에 메모리 매핑할 수 없습니다" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu바이트를 메모리 매핑할 수 없습니다" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2492,7 +2511,14 @@ msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니 msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2503,6 +2529,13 @@ msgstr "" "잠깐 지워야 합니다. 이 패키지를 지우는 건 좋지 않지만, 정말 지우려면 APT::" "Force-LoopBreak 옵션을 켜십시오." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2711,19 +2744,19 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "해쉬 합계가 서로 다릅니다" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "다음 키 ID의 공개키가 없습니다:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2732,7 +2765,7 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2741,14 +2774,14 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2975,14 +3008,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "%s 파일을 열 수 없습니다" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "연결이 너무 빨리 끊어졌습니다" +#~ msgid "Could not patch file" +#~ msgstr "%s 파일을 열 수 없습니다" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/ku.po b/po/ku.po index c0db0e0db..752e98f8f 100644 --- a/po/ku.po +++ b/po/ku.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" @@ -444,26 +444,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -567,7 +567,7 @@ msgstr "" msgid "Y" msgstr "E" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -710,7 +710,7 @@ msgstr "" msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "" @@ -726,11 +726,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -759,25 +759,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Cihê vala li %s têre nake." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Erê, wusa bike!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -785,74 +786,74 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Betal." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Sazkirin tê betalkirin." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Sazkirî]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -860,74 +861,85 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jixwe guhertoya nûtirîn e.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -943,49 +955,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Peywira %s nehate dîtin" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -993,152 +1005,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1182,7 +1194,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1580,12 +1592,12 @@ msgid "File not found" msgstr "Pel nehate dîtin" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@ -1711,7 +1723,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1788,7 +1800,7 @@ msgstr "" #: methods/connect.cc:193 #, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" #: methods/connect.cc:240 @@ -1877,49 +1889,49 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "" -#: methods/http.cc:815 +#: methods/http.cc:816 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Nivîsîna pelê %s biserneket" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -1927,18 +1939,25 @@ msgstr "Çewtiya hundirîn" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2324,7 +2343,14 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2332,6 +2358,13 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2534,39 +2567,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "nav guherandin biserneket, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" @@ -2790,15 +2823,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Danegira %s nehate vekirin: %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Girêdan zû hatiye girtin" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Danegira %s nehate vekirin: %s" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/lt.po b/po/lt.po index 98cd4f62d..315c4ee02 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -155,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -499,26 +499,26 @@ msgstr "*** Nepavyko susieti %s su %s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archyvas neturėjo paketo lauko" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s neturi perrašymo įrašo\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -622,7 +622,7 @@ msgstr "Nepavyko pervadinti %s į %s" msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -768,7 +768,7 @@ msgstr "Įdiegti šiuos paketus be patvirtinimo [t/N]? " msgid "Some packages could not be authenticated" msgstr "Nepavyko autentikuoti kai kurių paketų" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Atsirado problemų ir -y buvo panaudotas be --force-yes" @@ -784,11 +784,11 @@ msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas." msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nepavyko perskaityti šaltinių sąrašo." @@ -817,25 +817,26 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "%s nėra pakankamai laisvos vietos." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Taip, daryk kaip liepiu!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -846,28 +847,28 @@ msgstr "" "Jei norite tęsti, įveskite frazę „%s“\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Nutraukti." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -875,48 +876,48 @@ msgstr "" "Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „apt-get update“ " "arba pabandykite su parametru --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing bei laikmenų apkeitimas nepalaikomas" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Nepavyko pataisyti dingusių paketų." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Diegimas nutraukiamas." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Pastaba: pažymimas %s vietoje %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketas %s yra virtualus, pateiktas:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Įdiegtas]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Reikia pažymėti įdiegimui bent vieną." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -927,73 +928,84 @@ msgstr "" "Tai gali reikšti, kad paketas dingęs, nebenaudojamas \n" "arba prieinamas tik iš kitų šaltinių.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Tačiau šie paketai jį pakeičia:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketas %s neturi diegimo kandidatų" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Pakartotinas %s įdiegimas neįmanomas, jo nepavyksta parsiųsti.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ir taip jau yra naujausias.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Nebuvo rastas „%s“ leidimas paketui „%s“" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Nebuvo rasta „%s“ versija paketui „%s“" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Pažymėta versija %s (%s) paketui %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Nepavyko užrakinti sąrašo aplanko" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1009,43 +1021,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Nepavyko rasti užduoties %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1053,7 +1065,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1065,115 +1077,115 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Sugadinti paketai" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Nepavyko" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Įvykdyta" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1181,7 +1193,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1190,32 +1202,32 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1259,7 +1271,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1674,11 +1686,11 @@ msgid "File not found" msgstr "Failas nerastas" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "" @@ -1804,7 +1816,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1880,7 +1892,7 @@ msgstr "Laikinas sutrikimas ieškant vardo „%s“" #: methods/connect.cc:193 #, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" #: methods/connect.cc:240 @@ -1968,48 +1980,48 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Nepavyko patikrinti %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Vidinė klaida" @@ -2017,18 +2029,25 @@ msgstr "Vidinė klaida" msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2414,7 +2433,14 @@ msgstr "" msgid "Malformed line %u in source list %s (vendor id)" msgstr "" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2422,6 +2448,13 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2628,39 +2661,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5 sumos neatitikimas" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Neatitinka dydžiai" @@ -2884,8 +2917,18 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." msgstr "" #: methods/rsh.cc:330 diff --git a/po/mr.po b/po/mr.po index d378e2154..277aafebe 100644 --- a/po/mr.po +++ b/po/mr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -151,7 +151,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" @@ -525,26 +525,26 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ" msgid " DeLink limit of %sB hit.\n" msgstr "%sB हीट ची डिलींक मर्यादा\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" @@ -648,7 +648,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास msgid "Y" msgstr "होय" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -793,7 +793,7 @@ msgstr "पडताळून पाहिल्याशिवाय ही प msgid "Some packages could not be authenticated" msgstr "काही पॅकेजेसचे प्रमाणिकरण होऊ शकत नाही" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "काही अडचणी आहेत आणि --force-yes शिवाय -y वापरला गेला" @@ -809,11 +809,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "उगमांच्या याद्या वाचता येणार नाहीत." @@ -842,25 +842,26 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "%s मध्ये तुमच्याकडे पुरेशी जागा नाही." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "क्षुल्लक फक्त निर्देशित केले आहे पण हे क्षुल्लक कृति/ऑपरेशन नाही." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "हो, मी म्ह्टल्याप्रमाणे करा!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -871,28 +872,28 @@ msgstr "" "पुढे '%s' उक्ती मध्ये लिहिणार \n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "व्यत्यय/बंद करा." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -900,48 +901,48 @@ msgstr "" "काही आर्काइव्हज आणण्यास असमर्थ, कदाचित apt-get रन करुन अद्ययावत करा किंवा --fix- " "बरोबर प्रयत्न कराहरवलेले/गहाळ?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "--fix- सापडत नाही आणि माध्यम/मिडिया अदलाबदल हे सध्या तांत्रिक मदत देऊ शकत नाही" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "न सापडणारी पॅकेजेस नीट करण्यास असमर्थ." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "संस्थापन खंडित करत आहे." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "%s हे आभासी पॅकेज ह्यांच्याकडून तरतूद केले आहे,:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr "[संस्थापित केले]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "तुम्ही संस्थापित करण्यासाठी एक निश्चित स्पष्टपणे निवडले पाहिजे." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -952,73 +953,84 @@ msgstr "" "याचा अर्थ असाही आहे की पॅकेज सापडत नाही,ते कालबाह्य किंवा \n" " म्हणजे ते दुसऱ्या उगमातून उपलब्ध\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s चे पुनर्संस्थापन शक्य नाही, हे डाऊनलोड करता येत नाही.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ही आधीच नविन आवृत्ती आहे.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1036,45 +1048,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "%s कार्य सापडू शकले नाही" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1082,7 +1094,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1094,122 +1106,122 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1218,30 +1230,30 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1326,7 +1338,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1742,11 +1754,11 @@ msgid "File not found" msgstr "फाईल सापडली नाही" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "स्टॅट करण्यास असमर्थ" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -1874,7 +1886,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -1949,8 +1961,8 @@ msgid "Temporary failure resolving '%s'" msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" #: methods/connect.cc:240 @@ -2040,47 +2052,47 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "फाईल छोटी करणे असफल" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -2088,18 +2100,25 @@ msgstr "अंतर्गत त्रुटी" msgid "Can't mmap an empty file" msgstr "रिकामी फाईल mmap करता येणार नाही" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "mmap चे %lu बाईटस् करता येणार नाहीत" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2485,7 +2504,14 @@ msgstr "%s स्त्रोत सुचीमध्ये %u रेषेव msgid "Malformed line %u in source list %s (vendor id)" msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा " -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2496,6 +2522,13 @@ msgstr "" "गुंतागुंतीमुळे/Pre-Depends पूर्व अवलंबित आवर्तन.हे नेहमीच वाईट असते, पण जर तुम्हाला ते खरोखर " "करावयाचे असेल तर,APT::Force-LoopBreak पर्याय कार्यान्वित करा." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2708,19 +2741,19 @@ msgstr "IO त्रुटी उगम निवडक संचयस्था msgid "rename failed, %s (%s -> %s)." msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "पुढील कळ ओळखचिन्हांसाठी सार्वजनिक कळ उपलब्ध नाही:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2729,7 +2762,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2738,7 +2771,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2746,7 +2779,7 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -2974,14 +3007,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "फाईल पॅच करता आली नाही" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "जोडणी अकाली बंद झाली" +#~ msgid "Could not patch file" +#~ msgstr "फाईल पॅच करता आली नाही" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/nb.po b/po/nb.po index e60b0e767..17096c85a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-02-01 18:26+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n" @@ -159,7 +159,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert p %s %s\n" @@ -535,26 +535,26 @@ msgstr "*** Klarte ikke msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %s B er ndd.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppfring\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppfring\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binroverstyringsoppfring heller\n" @@ -658,7 +658,7 @@ msgstr "Klarte ikke msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" @@ -803,7 +803,7 @@ msgstr "Installer disse pakkene uten verifikasjon [j/N]? " msgid "Some packages could not be authenticated" msgstr "Noen pakker ble ikke autentisert" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppsto problemer og -y ble brukt uten --force-yes" @@ -819,11 +819,11 @@ msgstr "Pakker trenges msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullfrte ikke" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -854,26 +854,27 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Dessverre, ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Bare trivielle endringer ble angitt, men dette er ikke en triviell endring." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ja, gjr som jeg sier!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -884,28 +885,28 @@ msgstr "" "For fortsette skriv inn teksten %s\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -913,48 +914,48 @@ msgstr "" "Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller --" "fix-missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og bytte av media stttes n ikke" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Klarer ikke rette p manglende pakker." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Avbryter istallasjonen." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, velger %s istedenfor %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Du m velge en pakke som skal installeres." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -965,73 +966,84 @@ msgstr "" "Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n" "tilgjengelig fra en annen kilde.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Flgende pakker erstatter den imidlertid:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakken %s har ingen installasjonskandidat" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s er allerede nyeste versjon.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgave %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versjon %s av %s ble ikke funnet" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Bruk apt-get autoremove for fjerne dem." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1049,43 +1061,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, autofjerneren (AutoRemover) dela noe" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Klarte ikke finne oppgave %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1093,7 +1105,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1105,122 +1117,122 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Du m angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil %s\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken dpkg-dev er installert.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "Du m angi minst en pakke du vil sjekke builddeps for" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1229,32 +1241,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1339,7 +1351,7 @@ msgstr "" "for mer informasjon og flere innstillinger\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1762,11 +1774,11 @@ msgid "File not found" msgstr "Fant ikke fila" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Klarte ikke f status" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Klarte ikke sette endringstidspunkt" @@ -1894,7 +1906,7 @@ msgstr "Tidsavbrudd p msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1969,8 +1981,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av %s" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)" #: methods/connect.cc:240 @@ -2061,47 +2073,47 @@ msgstr "Denne HTTP-tjeneren har msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Klarte ikke forkorte fila %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Intern feil" @@ -2109,12 +2121,12 @@ msgstr "Intern feil" msgid "Can't mmap an empty file" msgstr "Kan ikke utfre mmap p en tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunne ikke lage mmap av %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2123,6 +2135,13 @@ msgstr "" "Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. " "Nvrende verdi: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2508,7 +2527,14 @@ msgstr "Typen msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil p %u i kildelista %s (selgers id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2519,6 +2545,13 @@ msgstr "" "s pga. en konflikt/forutsettelses-lkke. Dette er ofte stygt, men hvis du " "virkelig vil det, s bruk innstillingen APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2728,20 +2761,20 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2750,7 +2783,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2759,13 +2792,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2993,14 +3026,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunne ikke pne fila %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Forbindelsen ble uventet stengt" +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pne fila %s" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/ne.po b/po/ne.po index 7cb27e9dd..aac9721f2 100644 --- a/po/ne.po +++ b/po/ne.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -154,7 +154,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n" @@ -530,26 +530,26 @@ msgstr "*** %s मा %s लिङ्क असफल भयो" msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" @@ -653,7 +653,7 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -798,7 +798,7 @@ msgstr "यी प्याकेजहरू रूजू बिना स् msgid "Some packages could not be authenticated" msgstr "केही प्याकेजहरू प्रमाणीकरण हुन सक्दैन" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "त्यहाँ समस्याहरू छन् र हुन्छलाई जोड नगरिकन -y को प्रयोग भयो" @@ -814,11 +814,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" @@ -847,25 +847,26 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन ।" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "त्रिभियल मात्र निर्दिष्ट गरिएको छ तर यो त्रिभियल सञ्चालन होइन ।" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "हो,मैले भने जस्तै गर्नुहोस्!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -876,28 +877,28 @@ msgstr "" "निरन्तरता दिन '%s' वाक्यांशमा टाइप गर्नुहोस् \n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "परित्याग गर्नुहोस् ।" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -905,47 +906,47 @@ msgstr "" "केही संग्रहहरू तान्न असक्षम भयो,apt-get अद्यावधिक चलिरहेछ वा हराइरहेको --fix-संगै प्रयास " "गर्नुहुन्छ ?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "हराइरहेको --fix-र स्वाप भइरहेको मेडिया हाल समर्थित भइरहेको छैन" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "हराइरहेको प्याकेजहरू सुधार्न असक्षम भयो ।" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "स्थापना परित्याग गरिदैछ ।" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "द्रष्टब्य, %s को सट्टा %s चयन भइरहेछ\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "प्याकेज %s ...द्वारा उपलब्ध गराइएको अवास्तविक प्याकेज हो:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [स्थापना भयो]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "तपाईँले स्थापना गर्न स्पष्ट रुपमा एउटा चयन गर्नुहोस् ।" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -956,74 +957,85 @@ msgstr "" "यसको मतलब प्याकेज हराइरहेको प्याकेज, बेकायम भयो\n" " अर्को स्रोतबाट मात्र उपलब्ध हुन्छ\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1039,44 +1051,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1084,7 +1096,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1097,122 +1109,122 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1221,30 +1233,30 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1327,7 +1339,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1743,11 +1755,11 @@ msgid "File not found" msgstr "फाइल फेला परेन " #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "स्थिर गर्न असफल भयो" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "परिमार्जन समय सेट असफल भयो" @@ -1875,7 +1887,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1950,8 +1962,8 @@ msgid "Temporary failure resolving '%s'" msgstr "'%s' हल गर्दा अस्थायी असफल" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो" #: methods/connect.cc:240 @@ -2039,48 +2051,48 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "फाइल %s लेख्न असफल भयो" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -2088,18 +2100,25 @@ msgstr "आन्तरिक त्रुटि" msgid "Can't mmap an empty file" msgstr "एउटा खाली फाइल mmap बनाउन सकिएन" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "%lu बाइटहरुको mmap बनाउन सकिएन" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2486,7 +2505,14 @@ msgstr "स्रोत सूची %s भित्र %u लाइनमा msgid "Malformed line %u in source list %s (vendor id)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2497,6 +2523,13 @@ msgstr "" "हटाउनु पर्नेछ । यो प्राय नराम्रो हो, तर यदि तपाईँ यो साँच्चै गर्न चाहनुहुन्छ भने, APT::" "Force-LoopBreak विकल्प सक्रिय गर्नुहोस् ।" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2704,20 +2737,20 @@ msgstr "स्रोत क्यास बचत गर्दा IO त्र msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "निम्न कुञ्जी IDs को लागि कुनै सार्वजनिक कुञ्जी उपलब्ध छैन:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2726,7 +2759,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2735,13 +2768,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "प्याकेज अनुक्रमणिका फाइलहरू दूषित भए । प्याकेज %s को लागि कुनै फाइलनाम: फाँट छैन ।" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -2968,15 +3001,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "फाइल %s खोल्न सकिएन" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "जडान असमायिक बन्द भयो" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "फाइल %s खोल्न सकिएन" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/nl.po b/po/nl.po index a5ef1ead5..31068dbd7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-05-05 18:39+0200\n" "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" @@ -535,26 +535,26 @@ msgstr "*** Linken van %s aan %s is mislukt" msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" @@ -658,7 +658,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -804,7 +804,7 @@ msgstr "Wilt u deze pakketten installeren zonder verificatie [j/N]? " msgid "Some packages could not be authenticated" msgstr "Sommige pakketten konden niet geauthentificeerd worden" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Er zijn problemen en -y was gebruikt zonder --force-yes" @@ -820,11 +820,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -855,25 +855,26 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "U heeft onvoldoende vrije schijfruimte op %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "'Trivial Only' is opgegeven, dit is echter geen triviale bewerking." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ja, doe wat ik zeg!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -884,28 +885,28 @@ msgstr "" "Als u wilt doorgaan, dient u de zin '%s' in te typen.\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Afbreken." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -913,49 +914,49 @@ msgstr "" "Kon sommige archieven niet ophalen, misschien kunt u 'apt-get update' of --" "fix-missing proberen?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing en medium wisselen wordt op dit moment niet ondersteund" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Geen oplossing voor de missende pakketten gevonden." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Installatie wordt afgebroken." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Let op, %s wordt geselecteerd in plaats van %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "%s wordt overgeslagen, het is al geïnstalleerd en opwaardering is niet " "gevraagd.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakket %s is een virtueel pakket voorzien door:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Geïnstalleerd]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "U dient er één expliciet te selecteren voor installatie." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -966,59 +967,70 @@ msgstr "" "een ander pakket. Mogelijk betekent dit dat het pakket ontbreekt,\n" "verouderd is, of enkel beschikbaar is van een andere bron\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Echter, de volgende pakketten vervangen dit:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakket %s heeft geen installeerbare kandidaat" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Herinstallatie van %s is niet mogelijk daar het niet opgehaald kan worden.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s is reeds de nieuwste versie.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versie '%s' voor '%s' is niet gevonden" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Kon de status van de bronpakketlijst %s niet opvragen" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1026,18 +1038,18 @@ msgstr "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "U kunt deze verwijderen via 'apt-get autoremove'." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1055,45 +1067,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Kon taak %s niet vinden" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1101,7 +1113,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1112,119 +1124,119 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1233,7 +1245,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1242,32 +1254,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1356,7 +1368,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koekrachten.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1782,11 +1794,11 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Status opvragen is mislukt" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Instellen van de aanpassingstijd is mislukt" @@ -1914,7 +1926,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1989,8 +2001,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2088,49 +2100,49 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Wegschrijven van bestand %s is mislukt" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Interne fout" @@ -2138,18 +2150,25 @@ msgstr "Interne fout" msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kon van %lu bytes geen mmap maken" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2542,7 +2561,14 @@ msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2554,6 +2580,13 @@ msgstr "" "vaak slecht, wilt u dit echt doen dan dient u de APT::Force-LoopBreak optie " "te activeren." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2772,20 +2805,20 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" msgid "rename failed, %s (%s -> %s)." msgstr "herbenoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2794,7 +2827,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2803,7 +2836,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2811,7 +2844,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -3043,14 +3076,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kon bestand niet patchen" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbinding werd voortijdig afgebroken" +#~ msgid "Could not patch file" +#~ msgstr "Kon bestand niet patchen" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/nn.po b/po/nn.po index 835b528ba..d39a3260c 100644 --- a/po/nn.po +++ b/po/nn.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -531,26 +531,26 @@ msgstr "*** Klarte ikkje lenkja %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" @@ -654,7 +654,7 @@ msgstr "Klarte ikkje endra namnet p msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -800,7 +800,7 @@ msgstr "Installer desse pakkane utan verifikasjon [j/N]? " msgid "Some packages could not be authenticated" msgstr "Nokre pakkar kunne ikkje bli autentisert" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Det oppstod problem, og -y vart brukt utan --force-yes" @@ -817,11 +817,11 @@ msgstr "Nokre pakkar m msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -850,26 +850,27 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har ikkje nok ledig plass i %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Trivial Only var spesifisert, men dette er ikkje noka triviell handling." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ja, gjer som eg seier!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -880,28 +881,28 @@ msgstr "" "For halda fram, m du skriva nyaktig %s.\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Avbryt." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -909,49 +910,49 @@ msgstr "" "Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller --" "fix-missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing og byte av medium er ikkje sttta for tida" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Klarte ikkje retta opp manglande pakkar." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Avbryt installasjon." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Merk, vel %s i staden for %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar over %s, for den er installert fr fr og ikkje sett til " "oppgradering.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installert]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Du m velja ein som skal installerast." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -962,74 +963,85 @@ msgstr "" "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n" "eller er berre tilgjengeleg fr ei anna kjelde\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Dei flgjande pakkane kan brukast i staden:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Det finst ingen installasjonskandidat for pakken %s" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "%s kan ikkje installerast p nytt, for pakken kan ikkje lastast ned.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Den nyaste versjonen av %s er installert fr fr.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Fann ikkje utgva %s av %s" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Fann ikkje versjonen %s av %s" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Klarte ikkje f status p kjeldepakkelista %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1045,44 +1057,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1090,7 +1102,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1102,123 +1114,123 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1227,31 +1239,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1335,7 +1347,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1754,11 +1766,11 @@ msgid "File not found" msgstr "Fann ikkje fila" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Klarte ikkje f status" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Klarte ikkje setja endringstidspunkt" @@ -1886,7 +1898,7 @@ msgstr "Tidsavbrot p msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1961,8 +1973,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av %s" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" #: methods/connect.cc:240 @@ -2051,48 +2063,48 @@ msgstr "Denne HTTP-tenaren har msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Klarte ikkje skriva fila %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Intern feil" @@ -2100,18 +2112,25 @@ msgstr "Intern feil" msgid "Can't mmap an empty file" msgstr "Kan ikkje utfra mmap p ei tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Klarte ikkje laga mmap av %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2498,7 +2517,14 @@ msgstr "Typen msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2510,6 +2536,13 @@ msgstr "" "om du verkeleg vil gjera det, kan du bruka innstillinga APT::Force-" "LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2722,20 +2755,20 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2744,7 +2777,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2752,14 +2785,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Feil storleik" @@ -2986,15 +3019,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Klarte ikkje opna fila %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Sambandet vart uventa stengd" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Klarte ikkje opna fila %s" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/pl.po b/po/pl.po index 0c1f5327f..c24f5a656 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-09-27 03:42+0100\n" "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -156,7 +156,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" @@ -534,26 +534,26 @@ msgstr "*** Nie udało się dowiązać %s do %s" msgid " DeLink limit of %sB hit.\n" msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada również wpisu w pliku override binariów\n" @@ -657,7 +657,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s" msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -802,7 +802,7 @@ msgstr "Zainstalować te pakiety bez weryfikacji [t/N]? " msgid "Some packages could not be authenticated" msgstr "Niektóre pakiety nie mogły zostać zweryfikowane" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Były problemy, a użyto -y bez --force-yes" @@ -818,11 +818,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nie udało się odczytać list źródeł." @@ -853,25 +853,26 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Niestety w %s nie ma wystarczającej ilości wolnego miejsca." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Nakazano wykonywać tylko trywialne operacje, a to nie jest trywialne." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Tak, rób jak mówię!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -882,28 +883,28 @@ msgstr "" "Aby kontynuować wpisz zdanie \"%s\"\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Przerwane." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -911,48 +912,48 @@ msgstr "" "Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić apt-get " "update lub użyć opcji --fix-missing" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing i zamiana nośników nie są obecnie obsługiwane" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Nie udało się poprawić brakujących pakietów." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Przerywanie instalacji" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Uwaga, wybieranie %s zamiast %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Pomijanie %s, jest już zainstalowane, a nie została wybrana aktualizacja.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pakiet %s jest pakietem wirtualnym zapewnianym przez:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Zainstalowany]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Należy jednoznacznie wybrać jeden z nich do instalacji." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -963,59 +964,70 @@ msgstr "" "Zazwyczaj oznacza to, że pakietu brakuje, został zastąpiony przez inny\n" "pakiet lub nie jest dostępny przy pomocy obecnie ustawionych źródeł.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Jednak następujące pakiety go zastępują:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Pakiet %s nie ma kandydata do instalacji" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "Ponowna instalacja pakietu %s nie jest możliwa, nie może on zostać pobrany.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s jest już w najnowszej wersji.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Wydanie \"%s\" dla \"%s\" nie zostało znalezione" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersję %s (%s) dla %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "Brak pakietu źródłowego \"%s\", wybieranie \"%s\" zamiast niego\n" +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Nie udało się zablokować katalogu list" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1023,18 +1035,18 @@ msgstr "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej " "wymagane.\n" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1052,43 +1064,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Nie udało się odnaleźć zadania %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1096,7 +1108,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1108,119 +1120,119 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz źródło %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1229,7 +1241,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1238,32 +1250,32 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1347,7 +1359,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1772,11 +1784,11 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Nie udało się wykonać operacji stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nie udało się ustawić czasu modyfikacji" @@ -1906,7 +1918,7 @@ msgstr "Przekroczony czas połączenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" @@ -1981,8 +1993,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\"" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)" #: methods/connect.cc:240 @@ -2076,47 +2088,47 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Nie udało się uciąć zawartości pliku %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Połączenie nie udało się" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -2124,12 +2136,12 @@ msgstr "Błąd wewnętrzny" msgid "Can't mmap an empty file" msgstr "Nie można wykonać mmap na pustym pliku" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nie udało się wykonać mmap %lu bajtów" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2138,6 +2150,13 @@ msgstr "" "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" "Limit. Aktualna wartość: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2524,7 +2543,14 @@ msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2536,6 +2562,13 @@ msgstr "" "nic dobrego, ale jeśli naprawdę chcesz to zrobić, włącz opcję APT::Force-" "LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2746,19 +2779,19 @@ msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źróde msgid "rename failed, %s (%s -> %s)." msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2767,7 +2800,7 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2776,14 +2809,14 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Błędny rozmiar" @@ -3020,14 +3053,30 @@ msgstr "" msgid "Not locked" msgstr "Nie zablokowany" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nie udało się nałożyć łatki na plik" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Połączenie zostało zamknięte przedwcześnie" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Brak pakietu źródłowego \"%s\", wybieranie \"%s\" zamiast niego\n" + +#~ msgid "Could not patch file" +#~ msgstr "Nie udało się nałożyć łatki na plik" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/pt.po b/po/pt.po index 7982d9b26..8af0a73c8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-09-09 20:54+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -530,26 +530,26 @@ msgstr "*** Falhou ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binária de 'override'\n" @@ -653,7 +653,7 @@ msgstr "Falhou renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -798,7 +798,7 @@ msgstr "Instalar estes pacotes sem verificação [y/N]? " msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e foi utilizado -y sem --force-yes" @@ -814,11 +814,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -849,25 +849,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço livre suficiente em %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only especificado mas isto não é uma operação trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -878,28 +879,28 @@ msgstr "" "Para continuar escreva a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abortado." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -907,47 +908,47 @@ msgstr "" "Não foi possível obter alguns arquivos, tente talvez correr apt-get update " "ou tente com --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados actualmente" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Não foi possível corrigir os pacotes em falta." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "A abortar a instalação." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Note, a seleccionar %s em vez de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Saltando %s, já está instalado e a actualização não está definida.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, por isso não será removido\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual disponibilizado por:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Você deve seleccionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -958,60 +959,71 @@ msgstr "" "Isso pode significar que o pacote falta, ou ficou obsoleto, ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "No entanto, os seguintes pacotes substituem-no:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" "A reinstalação de %s não é possível, o download do mesmo não pode ser " "feito.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já está na versão mais recente.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Não foi encontrado o Release '%s' para '%s'" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Não foi encontrada a versão '%s' para '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Impossível criar acesso exclusivo ao directório de listas" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1019,18 +1031,18 @@ msgstr "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilize 'apt-get autoremove' para os remover." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1048,43 +1060,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover estragou coisas" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Não foi possível encontrar a tarefa %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, a seleccionar %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1092,7 +1104,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1104,119 +1116,119 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1225,7 +1237,7 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1234,32 +1246,32 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1346,7 +1358,7 @@ msgstr "" "sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1768,11 +1780,11 @@ msgid "File not found" msgstr "Ficheiro não encontrado" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Falhou o stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Falhou definir hora de modificação" @@ -1900,7 +1912,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1975,8 +1987,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Falha temporária a resolver '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2071,47 +2083,47 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Falhou truncar o ficheiro" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Erro interno" @@ -2119,18 +2131,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Não é possível fazer mmap a um ficheiro vazio" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Não foi possível fazer mmap de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2520,7 +2539,14 @@ msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2532,6 +2558,13 @@ msgstr "" "normalmente é mau, mas se você quer realmente fazer isso, active a opção " "APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2752,21 +2785,21 @@ msgstr "Erro de I/O ao gravar a cache de código fonte" msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2776,7 +2809,7 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2785,7 +2818,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2793,7 +2826,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -3025,14 +3058,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o 'patch' ao ficheiro" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Ligação encerrada prematuramente" +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o 'patch' ao ficheiro" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 00ca3714a..a53089695 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -154,7 +154,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -535,26 +535,26 @@ msgstr "*** Falhou ao ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui entrada override fonte\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada override binária\n" @@ -658,7 +658,7 @@ msgstr "Falhou ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -804,7 +804,7 @@ msgstr "Instalar estes pacotes sem verificação [s/N]? " msgid "Some packages could not be authenticated" msgstr "Alguns pacotes não puderam ser autenticados" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Há problemas e -y foi usado sem --force-yes" @@ -820,11 +820,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pode ser lida." @@ -856,25 +856,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Você não possui espaço suficiente em %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" especificado mas esta não é uma operação trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Sim, faça o que eu digo!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -885,28 +886,28 @@ msgstr "" "Para continuar digite a frase '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abortar." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Você quer continuar [S/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -914,47 +915,47 @@ msgstr "" "Impossível buscar alguns arquivos, talvez executar apt-get update ou tentar " "com --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing e troca de mídia não são suportados atualmente" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Impossível corrigir pacotes faltantes." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Abortando instalação." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Nota, selecionando %s ao invés de %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "O pacote %s não está instalado, então não será removido\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "O pacote %s é um pacote virtual fornecido por:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalado]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Você deveria selecionar explicitamente um para instalar." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -965,58 +966,69 @@ msgstr "" "Isto pode significar que o pacote está faltando, ficou obsoleto ou\n" "está disponível somente a partir de outra fonte\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "No entanto, os pacotes a seguir o substituem:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "O pacote %s não tem candidato para instalação" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "A reinstalação de %s não é possível, não pode ser baixado.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s já é a versão mais nova.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versão '%s' para '%s' não foi encontrada" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Impossível criar trava no diretório de listas" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1024,18 +1036,18 @@ msgstr "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' para removê-los." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1053,43 +1065,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover quebrou coisas" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou coisas" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Impossível achar tarefa %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1097,7 +1109,7 @@ msgstr "" "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1109,117 +1121,117 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram retirados da \"Incoming\"." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1228,7 +1240,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1237,32 +1249,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1348,7 +1360,7 @@ msgstr "" "para mais informações e opções.\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1771,11 +1783,11 @@ msgid "File not found" msgstr "Arquivo não encontrado" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Falhou ao executar \"stat\"" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Falhou ao definir hora de modificação" @@ -1903,7 +1915,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" @@ -1978,8 +1990,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Falha temporária resolvendo '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2074,47 +2086,47 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Falhou ao truncar arquivo" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Erro interno" @@ -2122,18 +2134,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Não foi possível fazer \"mmap\" de %lu bytes" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2522,7 +2541,14 @@ msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2534,6 +2560,13 @@ msgstr "" "é ruim, mas se você realmente quer fazer isso, ative a opção APT::Force-" "LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2751,19 +2784,19 @@ msgstr "Erro de E/S ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2773,7 +2806,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2782,7 +2815,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2790,7 +2823,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -3020,14 +3053,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o patch" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexão encerrada prematuramente" +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o patch" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/ro.po b/po/ro.po index 7ede77733..ab812401f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -155,7 +155,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" @@ -537,26 +537,26 @@ msgstr "*** Eșec la „link” între %s și %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" @@ -660,7 +660,7 @@ msgstr "Eșec la redenumirea lui %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -805,7 +805,7 @@ msgstr "Instalați aceste pachete fără verificare [y/N]? " msgid "Some packages could not be authenticated" msgstr "Unele pachete n-au putut fi autentificate" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Sunt unele probleme și -y a fost folosit fără --force-yes" @@ -821,11 +821,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@ -855,26 +855,27 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Nu aveți suficient spațiu în %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "A fost specificat 'doar neimportant' dar nu este o operațiune neimportantă." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Da, fă cum îți spun!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -885,28 +886,28 @@ msgstr "" "Pentru a continua tastați fraza '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Renunțare." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Descărcarea unor fișiere a eșuat" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -914,47 +915,47 @@ msgstr "" "Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați 'apt-get " "update' sau încercați cu --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing și schimbul de mediu nu este deocamdată suportat" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Nu pot corecta pachetele lipsă." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Abandonez instalarea." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Notă, se selectează %s în locul lui %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Pachetul %s este un pachet virtual furnizat de către:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Instalat]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Ar trebui să alegeți în mod explicit unul pentru instalare." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -965,74 +966,85 @@ msgstr "" "Aceasta ar putea însemna că pachetul lipsește, s-a învechit, sau\n" "este disponibil numai din altă sursă\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Oricum următoarele pachete îl înlocuiesc:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Pachetul %s nu are nici un candidat la instalare" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Reinstalarea lui %s nu este posibilă, nu poate fi descărcat.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s este deja la cea mai nouă versiune.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Nu pot determina starea listei surse de pachete %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" # XXX: orice sugestie este bine-venită -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Folosiți 'apt-get autoremove' pentru a le șterge." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1051,43 +1063,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Nu s-a putut găsi sarcina %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1095,7 +1107,7 @@ msgstr "" "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet " "(sau oferiți o altă soluție)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1108,118 +1120,118 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Eșec" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1228,7 +1240,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1237,32 +1249,32 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1349,7 +1361,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1776,11 +1788,11 @@ msgid "File not found" msgstr "Fișier negăsit" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Eșec la „stat”" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Eșec la ajustarea timpului de modificare" @@ -1910,7 +1922,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat" msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" @@ -1986,8 +1998,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Eșec temporar la rezolvarea lui „%s”" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" #: methods/connect.cc:240 @@ -2081,48 +2093,48 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Eșec la trunchierea fișierului" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Eroare internă" @@ -2130,18 +2142,25 @@ msgstr "Eroare internă" msgid "Can't mmap an empty file" msgstr "Nu s-a putut executa „mmap” cu un fișier gol" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Nu s-a putut face mmap cu %lu octeți" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2529,7 +2548,14 @@ msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2541,6 +2567,13 @@ msgstr "" "nu-i de bine, dar dacă vreți întradevăr s-o faceți, activați opțiunea APT::" "Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2758,21 +2791,21 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eșuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2781,7 +2814,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2790,7 +2823,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2798,7 +2831,7 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -3029,14 +3062,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nu s-a putut peteci fișierul" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" +#~ msgid "Could not patch file" +#~ msgstr "Nu s-a putut peteci fișierul" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/ru.po b/po/ru.po index 6cdc4461c..2b9d85e96 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-05-03 22:01+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -161,7 +161,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" @@ -539,26 +539,26 @@ msgstr "*** Не удалось создать ссылку %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" @@ -663,7 +663,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@ -811,7 +811,7 @@ msgstr "Установить эти пакеты без проверки [y/N]? msgid "Some packages could not be authenticated" msgstr "Некоторые пакеты невозможно аутентифицировать" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Существуют проблемы, а параметр -y указан без --force-yes" @@ -829,11 +829,11 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -866,27 +866,28 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на %" "sB.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостаточно свободного места в %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запрошено выполнение только тривиальных операций, но это не тривиальная " "операция." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Да, делать, как я скажу!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -897,28 +898,28 @@ msgstr "" "Чтобы продолжить, введите фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Аварийное завершение." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Указан режим \"только скачивание\", и скачивание завершено" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -926,47 +927,47 @@ msgstr "" "Невозможно получить некоторые архивы, вероятно надо запустить apt-get update " "или попытаться повторить запуск с ключом --fix-missing" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing и смена носителя в данный момент не поддерживаются" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Невозможно исправить ситуацию с пропущенными пакетами." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Аварийное завершение установки." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Заметьте, вместо %2$s выбирается %1$s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Пропускается %s - пакет уже установлен и нет команды upgrade.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакет %s не установлен, поэтому не может быть удалён\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Установлен]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Вы должны явно указать, какой именно вы хотите установить." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -977,73 +978,84 @@ msgstr "" "Это может означать, что пакет отсутствует, устарел, или доступен из " "источников, не упомянутых в sources.list\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Однако следующие пакеты могут его заменить:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакета %s не найдены кандидаты на установку" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Переустановка %s невозможна, он не скачивается.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Уже установлена самая новая версия %s.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Релиз '%s' для '%s' не найден" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версия '%s' для '%s' не найдена" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" -msgstr "Нет пакета с исходным кодом '%s', вместо него берётся '%s'\n" +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Для их удаления используйте 'apt-get autoremove'." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1061,45 +1073,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Не удалось найти задачу %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1107,7 +1119,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1118,118 +1130,118 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1250,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1259,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1361,7 +1373,7 @@ msgstr "" "содержат подробную информацию и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1781,11 +1793,11 @@ msgid "File not found" msgstr "Файл не найден" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Не удалось получить атрибуты" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Не удалось установить время модификации" @@ -1917,7 +1929,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1992,8 +2004,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP адрес '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)" @@ -2088,47 +2100,47 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Не удалось обрезать файл" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2136,12 +2148,12 @@ msgstr "Внутренняя ошибка" msgid "Can't mmap an empty file" msgstr "Невозможно отобразить в память пустой файл" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Невозможно отобразить в память %lu байт" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2150,6 +2162,13 @@ msgstr "" "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. " "Текущее значение: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2545,7 +2564,14 @@ msgstr "Неизвестный тип '%s' в строке %u в списке и msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2558,6 +2584,13 @@ msgstr "" "Если вы действительно хотите продолжить, установите параметр APT::Force-" "LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2766,19 +2799,19 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Недоступен открытый ключ для следующих ID ключей:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2787,7 +2820,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2796,13 +2829,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -3034,14 +3067,30 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Не удалось пропатчить файл" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" +#~ msgid "No source package '%s' picking '%s' instead\n" +#~ msgstr "Нет пакета с исходным кодом '%s', вместо него берётся '%s'\n" + +#~ msgid "Could not patch file" +#~ msgstr "Не удалось пропатчить файл" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/sk.po b/po/sk.po index 4e86e2f00..58910ff25 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-12-10 16:49+0100\n" "PO-Revision-Date: 2009-12-03 09:20+0100\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -1116,7 +1116,7 @@ msgstr "Odporúčané balíky:" msgid "Calculating upgrade... " msgstr "Prepočítava sa aktualizácia... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Chyba" @@ -1582,7 +1582,7 @@ msgstr "Súbor %s/%s prepisuje ten z balíka %s" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 +#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" @@ -1762,34 +1762,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "Neplatné URI, lokálne URI nesmie začínať s //" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:167 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "Prihlasovanie" -#: methods/ftp.cc:173 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "Nedá sa zistiť názov druhej strany" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "Nedá sa zistiť lokálny názov" -#: methods/ftp.cc:209 methods/ftp.cc:237 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "Server zamietol naše spojenie s chybou: %s" -#: methods/ftp.cc:215 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s" -#: methods/ftp.cc:222 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "Zlyhalo zadanie hesla, server odpovedal: %s" -#: methods/ftp.cc:242 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -1797,114 +1797,114 @@ msgstr "" "Bol zadaný proxy server, ale nie prihlasovací skript. Acquire::ftp::" "ProxyLogin je prázdny." -#: methods/ftp.cc:270 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s" -#: methods/ftp.cc:296 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "Zlyhalo zadanie typu, server odpovedal: %s" -#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "Uplynul čas spojenia" -#: methods/ftp.cc:340 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "Server ukončil spojenie" -#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba pri čítaní" -#: methods/ftp.cc:350 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "Odpoveď preplnila zásobník." -#: methods/ftp.cc:367 methods/ftp.cc:379 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "Narušenie protokolu" -#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba pri zápise" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Nedá sa vytvoriť socket" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "Nedá sa pripojiť pasívny socket." -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo nezískal počúvajúci socket" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Nedá sa nadviazať socket" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Na sockete sa nedá počúvať" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Názov socketu sa nedá zistiť" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Príkaz PORT sa nedá odoslať" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Neznáma rodina adries %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Uplynulo spojenie dátového socketu" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Spojenie sa nedá prijať" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hašovaním súboru" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Uplynula doba dátového socketu" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Prenos dát zlyhal, server odpovedal „%s“" #. Get the files information -#: methods/ftp.cc:1002 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1114 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Nedá sa vyvolať " @@ -2016,80 +2016,80 @@ msgstr "Nedá sa otvoriť rúra pre %s" msgid "Read error from %s process" msgstr "Chyba pri čítaní z procesu %s" -#: methods/http.cc:384 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "Čaká sa na hlavičky" -#: methods/http.cc:530 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "Získal sa jeden riadok hlavičky cez %u znakov" -#: methods/http.cc:538 +#: methods/http.cc:539 msgid "Bad header line" msgstr "Chybná hlavička" -#: methods/http.cc:557 methods/http.cc:564 +#: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP server poslal neplatnú hlavičku odpovede" -#: methods/http.cc:593 +#: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "HTTP server poslal neplatnú hlavičku Content-Length" -#: methods/http.cc:608 +#: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "HTTP server poslal neplatnú hlavičku Content-Range" -#: methods/http.cc:610 +#: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "Tento HTTP server má poškodenú podporu rozsahov" -#: methods/http.cc:634 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "Neznámy formát dátumu" -#: methods/http.cc:787 +#: methods/http.cc:790 msgid "Select failed" msgstr "Výber zlyhal" -#: methods/http.cc:792 +#: methods/http.cc:795 msgid "Connection timed out" msgstr "Uplynul čas spojenia" -#: methods/http.cc:815 +#: methods/http.cc:818 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupného súboru" -#: methods/http.cc:846 +#: methods/http.cc:849 msgid "Error writing to file" msgstr "Chyba zápisu do súboru" -#: methods/http.cc:874 +#: methods/http.cc:877 msgid "Error writing to the file" msgstr "Chyba zápisu do tohto súboru" -#: methods/http.cc:888 +#: methods/http.cc:891 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie" -#: methods/http.cc:890 +#: methods/http.cc:893 msgid "Error reading from server" msgstr "Chyba pri čítaní zo servera" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" msgstr "Nepodarilo sa skrátiť súbor" -#: methods/http.cc:1146 +#: methods/http.cc:1149 msgid "Bad header data" msgstr "Zlé dátové záhlavie" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1166 methods/http.cc:1221 msgid "Connection failed" msgstr "Spojenie zlyhalo" -#: methods/http.cc:1310 +#: methods/http.cc:1313 msgid "Internal error" msgstr "Vnútorná chyba" @@ -2497,7 +2497,7 @@ msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Skomolený riadok %u v zozname zdrojov %s (id výrobcu)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:439 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2576,12 +2576,12 @@ msgstr "Spôsob %s nebol správne spustený" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter." -#: apt-pkg/init.cc:132 +#: apt-pkg/init.cc:133 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Systém balíkov „%s“ nie je podporovaný" -#: apt-pkg/init.cc:148 +#: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" msgstr "Nedá sa určiť vhodný typ systému balíkov" @@ -2887,78 +2887,98 @@ msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n" +#: apt-pkg/indexcopy.cc:530 +#, fuzzy, c-format +msgid "Skipping nonexistent file %s" +msgstr "Otvára sa konfiguračný súbor %s" + +#: apt-pkg/indexcopy.cc:536 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:542 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Nezhoda kontrolných haš súčtov" + #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" msgstr "Inštaluje sa %s" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" msgstr "Nastavuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removing %s" msgstr "Odstraňuje sa %s" #: apt-pkg/deb/dpkgpm.cc:52 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Balík „%s“ je úplne odstránený" + +#: apt-pkg/deb/dpkgpm.cc:53 #, c-format msgid "Running post-installation trigger %s" msgstr "Vykonáva sa spúšťač post-installation %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:558 #, c-format msgid "Directory '%s' missing" msgstr "Adresár „%s“ chýba" -#: apt-pkg/deb/dpkgpm.cc:653 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing %s" msgstr "Pripravuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Unpacking %s" msgstr "Rozbaľuje sa %s" -#: apt-pkg/deb/dpkgpm.cc:659 +#: apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Preparing to configure %s" msgstr "Pripravuje sa nastavenie %s" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Installed %s" msgstr "Nainštalovaný balík %s" -#: apt-pkg/deb/dpkgpm.cc:666 +#: apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Preparing for removal of %s" msgstr "Pripravuje sa odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Removed %s" msgstr "Odstránený balík %s" -#: apt-pkg/deb/dpkgpm.cc:673 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Preparing to completely remove %s" msgstr "Pripravuje sa úplné odstránenie %s" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Completely removed %s" msgstr "Balík „%s“ je úplne odstránený" -#: apt-pkg/deb/dpkgpm.cc:878 +#: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" "Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je " "pripojený?)\n" -#: apt-pkg/deb/dpkgpm.cc:907 +#: apt-pkg/deb/dpkgpm.cc:908 msgid "Running dpkg" msgstr "Spúšťa sa dpkg" diff --git a/po/sl.po b/po/sl.po index 83f9364d9..5cdc022da 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -150,7 +150,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -526,26 +526,26 @@ msgstr "*** Napaka pri povezovanju %s z %s" msgid " DeLink limit of %sB hit.\n" msgstr " Doseena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrevalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima prekrivnega vnosa\n" @@ -649,7 +649,7 @@ msgstr "Ni mogo msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -795,7 +795,7 @@ msgstr "Namestim te pakete brez prevejanje [y/N]? " msgid "Some packages could not be authenticated" msgstr "Nisem uspel avtenticirati nekaterih paketkov" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Prilo je do teav in -y je bil uporabljen brez --force-yes" @@ -812,11 +812,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogo msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." @@ -845,25 +845,26 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "V %s je premalo prostora." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Da, naredi tako kot pravim!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -874,28 +875,28 @@ msgstr "" "Za nadaljevanje vnesite frazo '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Prekini." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -903,47 +904,47 @@ msgstr "" "Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --" "fix-missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing in izmenjava medija trenutno nista podprta" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Ni mogoe popraviti manjkajoih paketov." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Prekinjanje namestitve." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Opomba: izbran %s namesto %s \n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paket %s ni nameen, zato ni odstranjen\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paket %s je navidezen in ga je priskrbel:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Nameeno]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Sami izberite paket, ki ga elite namestiti." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -954,74 +955,85 @@ msgstr "" "To ponavadi pomeni, da paket manjka, je zastaran ali\n" "pa je na voljo samo iz drugega vira.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Kakorkoli, naslednji paketi ga nadomestijo:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Paket %s nima kandidata za namestitev" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Najnoveja razliica %s je e nameena.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Izdaje '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Razliice '%s' za '%s' ni mogoe najti" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %s (%s) za %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Ni mogoe doloiti seznama izvornih paketov %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1037,44 +1049,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "vendar bo paket %s nameen" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1082,7 +1094,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1093,126 +1105,126 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1221,31 +1233,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1328,7 +1340,7 @@ msgstr "" "sources.list(5) in apt.conf(5).\n" " APT ima mo Super Krave.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1746,11 +1758,11 @@ msgid "File not found" msgstr "Datoteke ni mogoe najti" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Doloitev ni uspela" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Nastavitev asa spremembe ni uspela" @@ -1878,7 +1890,7 @@ msgstr "Povezava podatkovne vti msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1953,8 +1965,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Zaasna napaka pri razreevanju '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2043,48 +2055,48 @@ msgstr "Ta stre msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Napaka pri pisanju datoteke %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Notranja napaka" @@ -2092,18 +2104,25 @@ msgstr "Notranja napaka" msgid "Can't mmap an empty file" msgstr "mmap prazne datoteke ni mogo" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Ni mogoe narediti mmap %lu bajtov" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2491,7 +2510,14 @@ msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2502,6 +2528,13 @@ msgstr "" "zanke spora/predodvisnosti. To je ponavadi slabo, toda e zares elite " "odstranitev, vkljuite monost APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2713,20 +2746,20 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2735,7 +2768,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2744,7 +2777,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2752,7 +2785,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2981,15 +3014,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Ne morem odpreti datoteke %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Povezava se je prezgodaj zaprla" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Ne morem odpreti datoteke %s" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/sv.po b/po/sv.po index c0706bf93..ec7f2d32e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-03-03 23:15+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" @@ -528,27 +528,27 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgränsen på %sB nåddes.\n" # Fält vid namn "Package" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen källåsidosättningspost\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär åsidosättningspost\n" @@ -654,7 +654,7 @@ msgstr "Misslyckades med att byta namn på %s till %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -800,7 +800,7 @@ msgstr "Installera dessa paket utan verifiering [j/N]? " msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" @@ -816,11 +816,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." @@ -852,25 +852,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ja, gör som jag säger!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -882,28 +883,28 @@ msgstr "" " ?] " # Visas då man svarar nej -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Avbryter." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -911,48 +912,48 @@ msgstr "" "Vissa arkiv kunte inte hämtas. Prova att köra \"apt-get update\" eller med --" "fix-missing." -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing och mediabyte stöds inte för tillfället" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Kunde inte korrigera saknade paket." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Avbryter installationen." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Observera, väljer %s istället för %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Paketet %s är inte installerat, så det tas inte bort\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Paketet %s är ett virtuellt paket som tillhandahålls av:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Installerat]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Du bör uttryckligen ange ett att installera." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -963,76 +964,87 @@ msgstr "" "Det kan betyda att paketet saknas, har blivit föråldrat eller endast\n" "är tillgängligt från andra källor\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Dock kan följande paket ersätta det:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Paketet %s har ingen installationskandidat" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ominstallation av %s är inte möjlig, det kan inte hämtas.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s är redan den senaste versionen.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Utgåvan \"%s\" för \"%s\" hittades inte" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Version \"%s\" för \"%s\" hittades inte" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Kunde inte ta status på källkodspaketlistan %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Använd \"apt-get autoremove\" för att ta bort dem." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1050,44 +1062,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover förstörde något" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Kunde inte hitta funktionen %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1095,7 +1107,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1107,115 +1119,115 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1236,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1245,32 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1354,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1766,11 +1778,11 @@ msgid "File not found" msgstr "Filen hittades inte" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Kunde inte ta status" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Misslyckades ställa in ändringstid" @@ -1898,7 +1910,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1977,8 +1989,8 @@ msgstr "Temporärt fel vid uppslagning av \"%s\"" # Okänd felkod; %i = koden #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)" #: methods/connect.cc:240 @@ -2072,47 +2084,47 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Misslyckades med att kapa av filen" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Internt fel" @@ -2120,12 +2132,12 @@ msgstr "Internt fel" msgid "Can't mmap an empty file" msgstr "Kan inte utföra mmap på en tom fil" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Kunde inte utföra mmap på %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2134,6 +2146,13 @@ msgstr "" "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. " "Aktuellt värde: %lu. (man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2524,7 +2543,14 @@ msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2536,6 +2562,13 @@ msgstr "" "Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " "aktivera flaggan \"APT::Force-LoopBreak\"." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2749,19 +2782,19 @@ msgstr "In-/utfel vid lagring av källcache" msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2770,7 +2803,7 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2779,13 +2812,13 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@ -3014,14 +3047,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunde inte lägga på programfix på filen" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Anslutningen stängdes i förtid" +#~ msgid "Could not patch file" +#~ msgstr "Kunde inte lägga på programfix på filen" + # Prioritet följt av URI #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/th.po b/po/th.po index a6fffd05c..877d56ff7 100644 --- a/po/th.po +++ b/po/th.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-11-06 15:54+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -152,7 +152,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" @@ -521,26 +521,26 @@ msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" msgid " DeLink limit of %sB hit.\n" msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s ไม่มีข้อมูล override\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" @@ -644,7 +644,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -789,7 +789,7 @@ msgstr "จะติดตั้งแพกเกจเหล่านี้โ msgid "Some packages could not be authenticated" msgstr "มีบางแพกเกจไม่สามารถยืนยันแหล่งต้นตอได้" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "มีปัญหาบางประการ และมีการใช้ -y โดยไม่ระบุ --force-yes" @@ -805,11 +805,11 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" @@ -838,25 +838,26 @@ msgstr "หลังจากการกระทำนี้ ต้องใ msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Trivial Only ถูกกำหนดไว้ แต่คำสั่งนี้ไม่ใช่คำสั่งเล็กน้อย" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -867,28 +868,28 @@ msgstr "" "หากต้องการดำเนินการต่อ ให้พิมพ์ประโยค '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "เลิกทำ" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -896,47 +897,47 @@ msgstr "" "ดาวน์โหลดบางแพกเกจไม่สำเร็จ บางที การเรียก apt-get update หรือลองใช้ตัวเลือก --fix-" "missing อาจช่วยได้" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "ยังไม่รองรับ --fix-missing พร้อมกับการเปลี่ยนแผ่น" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "ไม่สามารถแก้ปัญหาแพกเกจที่ขาดหายได้" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "จะล้มเลิกการติดตั้ง" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "หมายเหตุ: จะเลือก %s แทน %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "จะข้าม %s เนื่องจากแพกเกจติดตั้งไว้แล้ว และไม่มีการกำหนดให้ปรับรุ่น\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "แพกเกจ %s เป็นแพกเกจเสมือนที่ตระเตรียมโดย:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [ติดตั้งอยู่]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "คุณควรเจาะจงเลือกแพกเกจใดแพกเกจหนึ่งเพื่อติดตั้ง" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -946,73 +947,84 @@ msgstr "" "ไม่มีแพกเกจ %s ให้ใช้ติดตั้ง แต่ถูกอ้างถึงโดยแพกเกจอื่น\n" "แพกเกจนี้อาจขาดหายไป หรือตกรุ่นไปแล้ว หรืออยู่ในแหล่งอื่น\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "อย่างไรก็ดี แพกเกจต่อไปนี้ได้แทนที่แพกเกจดังกล่าวไปแล้ว:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "แพกเกจ %s ไม่มีรุ่นที่จะใช้ติดตั้ง" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "ไม่สามารถติดตั้ง %s ซ้ำได้ เนื่องจากไม่สามารถดาวน์โหลดได้\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s เป็นรุ่นใหม่ล่าสุดอยู่แล้ว\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "ไม่พบรุ่นย่อย '%s' ของ '%s'" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "ไม่พบรุ่น '%s' ของ '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1030,43 +1042,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "ไม่พบงาน %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1074,7 +1086,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1085,122 +1097,122 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1209,30 +1221,30 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1316,7 +1328,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1729,11 +1741,11 @@ msgid "File not found" msgstr "ไม่พบแฟ้ม" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "stat ไม่สำเร็จ" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -1859,7 +1871,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" @@ -1934,8 +1946,8 @@ msgid "Temporary failure resolving '%s'" msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2023,47 +2035,47 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "ไม่สามารถตัดท้ายแฟ้ม" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -2071,18 +2083,25 @@ msgstr "ข้อผิดพลาดภายใน" msgid "Can't mmap an empty file" msgstr "ไม่สามารถ mmap แฟ้มเปล่า" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "ไม่สามารถสร้าง mmap ขนาด %lu ไบต์" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2468,7 +2487,14 @@ msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด msgid "Malformed line %u in source list %s (vendor id)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2480,6 +2506,13 @@ msgstr "" "ซึ่งแพกเกจดังกล่าวเป็นแพกเกจที่จำเป็นสำหรับระบบ การลบดังกล่าวมักเป็นอันตราย " "แต่ถ้าคุณต้องการทำเช่นนั้นจริงๆ ก็ให้เปิดตัวเลือก APT::Force-LoopBreak" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2684,39 +2717,39 @@ msgstr "เกิดข้อผิดพลาด IO ขณะบันทึ msgid "rename failed, %s (%s -> %s)." msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "ไม่มีกุญแจสาธารณะสำหรับกุญแจหมายเลขต่อไปนี้:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "แฟ้มดัชนีแพกเกจเสียหาย ไม่มีข้อมูล Filename: (ชื่อแฟ้ม) สำหรับแพกเกจ %s" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -2946,14 +2979,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "ไม่สามารถแพตช์แฟ้ม" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "การเชื่อมต่อถูกปิดก่อนเวลาอันควร" +#~ msgid "Could not patch file" +#~ msgstr "ไม่สามารถแพตช์แฟ้ม" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/tl.po b/po/tl.po index b13c98f28..b737f64d2 100644 --- a/po/tl.po +++ b/po/tl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -157,7 +157,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -539,26 +539,26 @@ msgstr "*** Bigo ang pag-link ng %s sa %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" @@ -662,7 +662,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -809,7 +809,7 @@ msgstr "Iluklok ang mga paketeng ito na walang beripikasyon [o/H]? " msgid "Some packages could not be authenticated" msgstr "May mga paketeng hindi matiyak ang pagka-awtentiko" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "May mga problema at -y ay ginamit na walang --force-yes" @@ -827,11 +827,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -863,25 +863,26 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Kulang kayo ng libreng puwang sa %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Tinakdang Trivial Only ngunit hindi ito operasyong trivial." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Oo, gawin ang sinasabi ko!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -892,28 +893,28 @@ msgstr "" "Upang magpatuloy, ibigay ang pariralang '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Abort." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -921,48 +922,48 @@ msgstr "" "Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang apt-get update o " "subukang may --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing at pagpalit ng media ay kasalukuyang hindi suportado" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Hindi maayos ang mga kulang na pakete." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Ina-abort ang pag-instol." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Paunawa, pinili ang %s imbes na %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Nakaluklok]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Dapat kayong mamili ng isa na iluluklok." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -973,74 +974,85 @@ msgstr "" "Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s ay pinakabagong bersyon na.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Release '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1056,46 +1068,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1103,7 +1115,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1114,115 +1126,115 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1243,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1252,32 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1348,7 +1360,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1768,11 +1780,11 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Bigo ang pag-stat" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Bigo ang pagtakda ng oras ng pagbago" @@ -1900,7 +1912,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1975,8 +1987,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2071,48 +2083,48 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Bigo sa pagsulat ng talaksang %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Internal na error" @@ -2120,18 +2132,25 @@ msgstr "Internal na error" msgid "Can't mmap an empty file" msgstr "Hindi mai-mmap ang talaksang walang laman" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Hindi makagawa ng mmap ng %lu na byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2524,7 +2543,14 @@ msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2536,6 +2562,13 @@ msgstr "" "loop. Madalas ay masama ito, ngunit kung nais niyo talagang gawin ito, i-" "activate ang APT::Force-LoopBreak na option." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2752,20 +2785,20 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2774,7 +2807,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2783,7 +2816,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2791,7 +2824,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -3022,14 +3055,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Hindi mai-patch ang talaksan" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Nagsara ng maaga ang koneksyon" +#~ msgid "Could not patch file" +#~ msgstr "Hindi mai-patch ang talaksan" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/uk.po b/po/uk.po index 5ce161242..e8a750ce2 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s %s скомпільовано %s %s\n" @@ -537,26 +537,26 @@ msgstr "*** Не вдалося створити посилання %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr "Перевищено ліміт в %s в DeLink.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "В архіві немає поля package" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення для %s\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжує %s, а не %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -660,7 +660,7 @@ msgstr "Не вдалося перейменувати %s в %s" msgid "Y" msgstr "Т" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -807,7 +807,7 @@ msgstr "Встановити ці пакунки без перевірки [т/ msgid "Some packages could not be authenticated" msgstr "Деякі пакунки неможливо автентифікувати" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Існують проблеми, а опція -y використана без --force-yes" @@ -825,11 +825,11 @@ msgstr "Пакунки необхідно видалити, але видале msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати теку для завантаження" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Неможливо прочитати перелік джерел." @@ -859,27 +859,28 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Недостатньо вільного місця в %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Запитане виконання тільки тривіальних операцій, але це не тривіальна " "операція." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Так, робити, як я скажу!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -890,28 +891,28 @@ msgstr "" "Щоб продовжити, введіть фразу: '%s'\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Перервано." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Т/н]? " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -919,49 +920,49 @@ msgstr "" "Неможливо завантажити деякі архіви, імовірно треба виконати apt-get update " "або спробувати повторити запуск з ключем --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "--fix-missing і зміна носія в даний момент не підтримується" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Неможливо виправити втрачені пакунки." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Переривається встановлення." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Помітьте, замість %2$s вибирається %1$s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" "Пропускається %s - пакунок вже встановлений, і опція upgrade не " "встановлена.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Пакунок %s не встановлений, тому не може бути видалений\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Пакунок %s - віртуальний, його функції надаються пакунками:\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Встановлено]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Ви повинні явно вказати, який саме ви хочете встановити." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -973,74 +974,85 @@ msgstr "" "Це може означати, що пакунок відсутній, застарів, або доступний з джерел, не " "згаданих в sources.list\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Однак наступні пакунки можуть його замінити:" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Для пакунка %s не знайдені кандидати на встановлення" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Перевстановлення %s неможливе, бо він не може бути завантаженим.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Вже встановлена найновіша версія %s.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Реліз '%s' для '%s' не знайдений" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Версія '%s' для '%s' не знайдена" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Обрана версія %s (%s) для %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Неможливо заблокувати теку з переліками пакунків" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1058,46 +1070,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade все поламав" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "але %s буде встановлений" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1105,7 +1117,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи імені пакунка (або знайдіть інше рішення)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1116,121 +1128,121 @@ msgstr "" "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають " "розпаковані вихідні тексти\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1250,7 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1259,32 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій " "пакунка %s не задовольняє умови" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений " "пакунок %s новіше, аніж треба" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1359,7 +1371,7 @@ msgstr "" "містять більше інформації.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1783,11 +1795,11 @@ msgid "File not found" msgstr "Файл не знайдено" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Не вдалося одержати атрибути" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Не вдалося встановити час модифікації" @@ -1917,7 +1929,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -1992,8 +2004,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Тимчасова помилка при отриманні IP адреси '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)" #: methods/connect.cc:240 @@ -2086,50 +2098,50 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Вибір не вдався" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Помилка запису в вихідний файл" -#: methods/http.cc:846 +#: methods/http.cc:847 #, fuzzy msgid "Error writing to file" msgstr "Помилка запису в файл" -#: methods/http.cc:874 +#: methods/http.cc:875 #, fuzzy msgid "Error writing to the file" msgstr "Помилка запису в файл" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Помилка читання з сервера" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Не вдалося записати файл %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Внутрішня помилка" @@ -2137,18 +2149,25 @@ msgstr "Внутрішня помилка" msgid "Can't mmap an empty file" msgstr "Неможливо відобразити в пам'яті пустий файл" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Неможливо відобразити в пам'яті %lu байт" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2543,7 +2562,14 @@ msgstr "Невідомий тип '%s' в лінії %u в переліку дж msgid "Malformed line %u in source list %s (vendor id)" msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2555,6 +2581,13 @@ msgstr "" "погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-" "LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2766,21 +2799,21 @@ msgstr "Помилка IO під час збереження джерельно msgid "rename failed, %s (%s -> %s)." msgstr "Не вдалося перейменувати, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 #, fuzzy msgid "There is no public key available for the following key IDs:\n" msgstr "Відсутній публічний ключ для заданих ID ключа:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2789,7 +2822,7 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2798,14 +2831,14 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -3033,14 +3066,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Неможливо накласти латку на файл" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "З'єднання завершено передчасно" +#~ msgid "Could not patch file" +#~ msgstr "Неможливо накласти латку на файл" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/vi.po b/po/vi.po index d67075ec7..abbb2dc1c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2008-12-22 19:04+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -154,7 +154,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s cho %s được biên dịch trên %s %s\n" @@ -556,26 +556,26 @@ msgstr "*** Việc liên kết %s đến %s bị lỗi" msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s không phải %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè nguồn\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè nhị phân\n" @@ -679,7 +679,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi" msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" @@ -826,7 +826,7 @@ msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c msgid "Some packages could not be authenticated" msgstr "Một số gói không thể được xác thực" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có « --force-yes »" @@ -842,11 +842,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Không thể khóa thư mục tải về" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." @@ -876,26 +876,27 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\ msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s." -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "" "Xác đinh « Chỉ không đáng kể » (Trivial Only) nhưng mà thao tác này đáng kể." -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Có, làm đi." -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -906,28 +907,28 @@ msgstr "" "Để tiếp tục thì hãy gõ cụm từ « %s »\n" "?]" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Hủy bỏ." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -935,49 +936,49 @@ msgstr "" "Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy cập " "nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "" "Chưa hô trợ tùy chọn « --fix-missing » (sửa khi thiếu điều) và trao đổi " "phương tiện." -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Không thể sửa những gói còn thiếu." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "Đang hủy bỏ cài đặt." -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Ghi chú : đang chọn %s thay vì %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "Gói %s là gói ảo được cung cấp do :\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Đã cài đặt]" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Bạn nên chọn một cách dứt khoát gói cần cài." -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -988,75 +989,86 @@ msgstr "" "đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n" "đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Tuy nhiên, những gói theo đây thay thế nó :" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Gói %s không có ứng cử cài đặt" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s là phiên bản mơi nhất.\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Không tìm thấy bản phát hành « %s » cho « %s »" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Không tìm thấy phiên bản « %s » cho « %s »" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhật đối số" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Không thể khóa thư mục danh sách" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng." -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1074,43 +1086,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì." -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "Không tìm thấy tác vụ %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành « được cài đặt bằng tay ».\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1118,7 +1130,7 @@ msgstr "" "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install " "» mà không có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1130,123 +1142,123 @@ msgstr "" "bất định, có lẽ chưa tạo một số gói cần thiết,\n" "hoặc chưa di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1255,31 +1267,31 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1371,7 +1383,7 @@ msgstr "" "sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1796,11 +1808,11 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Việc lấy các thông tin bị lỗi" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Việc lập giờ sửa đổi bị lỗi" @@ -1928,7 +1940,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -2003,8 +2015,8 @@ msgid "Temporary failure resolving '%s'" msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)" #: methods/connect.cc:240 @@ -2098,47 +2110,47 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Lỗi cắt ngắn tập tin" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2146,18 +2158,25 @@ msgstr "Gặp lỗi nội bộ" msgid "Can't mmap an empty file" msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2546,7 +2565,14 @@ msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2558,6 +2584,13 @@ msgstr "" "bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak " "» (buộc ngắt vòng lặp)." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2770,19 +2803,19 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Sai khớp tổng băm (hash sum)" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2791,7 +2824,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2800,7 +2833,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2808,7 +2841,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -3037,14 +3070,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Không thể vá lỗi trong tập tin %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Kết nối bị đóng quá sớm." +#~ msgid "Could not patch file" +#~ msgstr "Không thể vá lỗi trong tập tin %s" + # Variable: do not translate/ biến: đừng dịch #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 753bba073..8daf9e203 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-12-10 16:49+0100\n" "PO-Revision-Date: 2009-12-02 01:00+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -1107,7 +1107,7 @@ msgstr "推荐安装的软件包：" msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失败" @@ -1566,7 +1566,7 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 -#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 +#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 #, c-format msgid "Unable to read %s" @@ -1745,148 +1745,148 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "无效的 URI，本地的 URI 不能以 // 开头" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:167 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "正在登录" -#: methods/ftp.cc:173 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "无法获知对方主机名" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "无法获知本地主机名" -#: methods/ftp.cc:209 methods/ftp.cc:237 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" msgstr "服务器拒绝了我们的连接，响应信息为：%s" -#: methods/ftp.cc:215 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "USER 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:222 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "PASS 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:242 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" "您指定了代理服务器，但是没有登陆脚本，Acquire::ftp::ProxyLogin 设置为空。" -#: methods/ftp.cc:270 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "登录脚本命令“%s”出错，服务器响应信息为：%s" -#: methods/ftp.cc:296 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "TYPE 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "连接超时" -#: methods/ftp.cc:340 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" -#: methods/ftp.cc:350 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "回应超出了缓存区大小。" -#: methods/ftp.cc:367 methods/ftp.cc:379 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 msgid "Write error" msgstr "写出错" -#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "无法创建套接字" -#: methods/ftp.cc:703 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "无法连接上数据套接字，连接超时" -#: methods/ftp.cc:709 +#: methods/ftp.cc:710 msgid "Could not connect passive socket." msgstr "无法连接被动模式的套接字。" -#: methods/ftp.cc:727 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "getaddrinfo 无法得到监听套接字" -#: methods/ftp.cc:741 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "无法绑定套接字" -#: methods/ftp.cc:745 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "无法在套接字上监听" -#: methods/ftp.cc:752 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "无法确定套接字的名字" -#: methods/ftp.cc:784 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "无法发出 PORT 指令" -#: methods/ftp.cc:794 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "无法识别的地址族 %u (AF_*)" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "EPRT 指令出错，服务器响应信息为：%s" -#: methods/ftp.cc:823 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "数据套接字连接超时" -#: methods/ftp.cc:830 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" -#: methods/ftp.cc:882 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "无法获取文件，服务器响应信息为“%s”" -#: methods/ftp.cc:897 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "数据套接字超时" -#: methods/ftp.cc:927 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "数据传送出错，服务器响应信息为“%s”" #. Get the files information -#: methods/ftp.cc:1002 +#: methods/ftp.cc:1005 msgid "Query" msgstr "查询" -#: methods/ftp.cc:1114 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "无法调用 " @@ -1994,80 +1994,80 @@ msgstr "无法为 %s 开启管道" msgid "Read error from %s process" msgstr "从 %s 进程读取数据出错" -#: methods/http.cc:384 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "正在等待报头" -#: methods/http.cc:530 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "接收到一行报头行，它的长度超过了 %u 个字符" -#: methods/http.cc:538 +#: methods/http.cc:539 msgid "Bad header line" msgstr "错误的报头行" -#: methods/http.cc:557 methods/http.cc:564 +#: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" msgstr "该 HTTP 服务器发送了一个无效的应答报头" -#: methods/http.cc:593 +#: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Length 报头" -#: methods/http.cc:608 +#: methods/http.cc:609 msgid "The HTTP server sent an invalid Content-Range header" msgstr "该 HTTP 服务器发送了一个无效的 Content-Range 报头" -#: methods/http.cc:610 +#: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "该 HTTP 服务器的 range 支持不正常" -#: methods/http.cc:634 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:787 +#: methods/http.cc:790 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:792 +#: methods/http.cc:795 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:815 +#: methods/http.cc:818 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:846 +#: methods/http.cc:849 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:874 +#: methods/http.cc:877 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:888 +#: methods/http.cc:891 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:890 +#: methods/http.cc:893 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 msgid "Failed to truncate file" msgstr "无法截断文件" -#: methods/http.cc:1146 +#: methods/http.cc:1149 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1166 methods/http.cc:1221 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1310 +#: methods/http.cc:1313 msgid "Internal error" msgstr "内部错误" @@ -2474,7 +2474,7 @@ msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“ msgid "Malformed line %u in source list %s (vendor id)" msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:439 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2554,12 +2554,12 @@ msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "请把标有“%s”的盘片插入驱动器“%s”再按回车键。" -#: apt-pkg/init.cc:132 +#: apt-pkg/init.cc:133 #, c-format msgid "Packaging system '%s' is not supported" msgstr "不支持“%s”打包系统" -#: apt-pkg/init.cc:148 +#: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" msgstr "无法确定适合的打包系统类型" @@ -2862,76 +2862,96 @@ msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n" msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n" +#: apt-pkg/indexcopy.cc:530 +#, fuzzy, c-format +msgid "Skipping nonexistent file %s" +msgstr "正在打开配置文件 %s" + +#: apt-pkg/indexcopy.cc:536 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:542 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Hash 校验和不符" + #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" msgstr "正在安装 %s" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" msgstr "正在配置 %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format msgid "Removing %s" msgstr "正在删除 %s" #: apt-pkg/deb/dpkgpm.cc:52 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "完全删除了 %s" + +#: apt-pkg/deb/dpkgpm.cc:53 #, c-format msgid "Running post-installation trigger %s" msgstr "执行安装后执行的触发器 %s" -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:558 #, c-format msgid "Directory '%s' missing" msgstr "目录 %s 不见了" -#: apt-pkg/deb/dpkgpm.cc:653 +#: apt-pkg/deb/dpkgpm.cc:654 #, c-format msgid "Preparing %s" msgstr "正在准备 %s" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:655 #, c-format msgid "Unpacking %s" msgstr "正在解压缩 %s" -#: apt-pkg/deb/dpkgpm.cc:659 +#: apt-pkg/deb/dpkgpm.cc:660 #, c-format msgid "Preparing to configure %s" msgstr "正在准备配置 %s" -#: apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:662 #, c-format msgid "Installed %s" msgstr "已安装 %s" -#: apt-pkg/deb/dpkgpm.cc:666 +#: apt-pkg/deb/dpkgpm.cc:667 #, c-format msgid "Preparing for removal of %s" msgstr "正在准备 %s 的删除操作" -#: apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:669 #, c-format msgid "Removed %s" msgstr "已删除 %s" -#: apt-pkg/deb/dpkgpm.cc:673 +#: apt-pkg/deb/dpkgpm.cc:674 #, c-format msgid "Preparing to completely remove %s" msgstr "正在准备完全删除 %s" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:675 #, c-format msgid "Completely removed %s" msgstr "完全删除了 %s" -#: apt-pkg/deb/dpkgpm.cc:878 +#: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "无法写入日志。 openpty() 失败(没有挂载 /dev/pts ？)\n" -#: apt-pkg/deb/dpkgpm.cc:907 +#: apt-pkg/deb/dpkgpm.cc:908 msgid "Running dpkg" msgstr "正在运行 dpkg" diff --git a/po/zh_TW.po b/po/zh_TW.po index 993608474..6358c9789 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-27 17:32+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -153,7 +153,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" @@ -523,26 +523,26 @@ msgstr "*** 無法將 %s 連結到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "套件檔裡沒有套件資訊" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " %s 沒有重新定義項目\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的維護者是 %s，而非 %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, c-format msgid " %s has no source override entry\n" msgstr " %s 沒有原始碼重新定義項目\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 也沒有二元碼重新定義項目\n" @@ -646,7 +646,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -791,7 +791,7 @@ msgstr "是否不經驗證就安裝這些套件？[y/N]" msgid "Some packages could not be authenticated" msgstr "有部份套件無法驗證" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "發生了問題，且 -y 並沒有和 --force-yes 搭配使用" @@ -807,11 +807,11 @@ msgstr "有套件需要被移除，但卻被禁止移除。" msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，排序未能完成" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "無法鎖定下載目錄" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "無法讀取來源列表。" @@ -840,25 +840,26 @@ msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" -#: cmdline/apt-get.cc:876 +#: cmdline/apt-get.cc:880 #, c-format msgid "You don't have enough free space in %s." msgstr "在 %s 裡沒有足夠的的未使用空間。" -#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 msgid "Trivial Only specified but this is not a trivial operation." msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 trivial 操作。" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Yes, do as I say!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -869,28 +870,28 @@ msgstr "" "請輸入 '%s' 這個句子以繼續進行\n" " ?] " -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "放棄執行。" -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 msgid "Do you want to continue [Y/n]? " msgstr "是否繼續進行 [Y/n]？" -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "有部份檔案無法下載" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -898,47 +899,47 @@ msgstr "" "有部份套件檔無法取得，試著執行 apt-get update 或者試著加上 --fix-missing 選" "項？" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 msgid "--fix-missing and media swapping is not currently supported" msgstr "目前尚未支援 --fix-missing 和媒體抽換" -#: cmdline/apt-get.cc:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "無法修正欠缺的套件。" -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 msgid "Aborting install." msgstr "放棄安裝。" -#: cmdline/apt-get.cc:1082 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "注意，選擇了以 %s 替代 %s\n" -#: cmdline/apt-get.cc:1093 +#: cmdline/apt-get.cc:1097 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n" -#: cmdline/apt-get.cc:1111 +#: cmdline/apt-get.cc:1115 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n" -#: cmdline/apt-get.cc:1122 +#: cmdline/apt-get.cc:1126 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "套件 %s 是虛擬套件，提供者為：\n" -#: cmdline/apt-get.cc:1134 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr "【已安裝】" -#: cmdline/apt-get.cc:1139 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "請您明確地選擇一個來進行安裝。" -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1148 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -948,73 +949,84 @@ msgstr "" "無法取得套件 %s，但它卻被其它的套件引用了。\n" "這意味著這個套件可能已經消失了、被廢棄了，或是只能由其他的來源取得\n" -#: cmdline/apt-get.cc:1163 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "然而，下列的套件取代了它：" -#: cmdline/apt-get.cc:1166 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "套件 %s 沒有可安裝的候選版本" -#: cmdline/apt-get.cc:1186 +#: cmdline/apt-get.cc:1190 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "無法重新安裝 %s，因為它無法下載。\n" -#: cmdline/apt-get.cc:1194 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "%s 已經是最新版本了。\n" -#: cmdline/apt-get.cc:1223 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "找不到 '%2$s' 的 '%1$s' 發行版" -#: cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "找不到 '%s' 版的 '%s'" -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" -#: cmdline/apt-get.cc:1348 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "無法取得來源套件列表 %s 的狀態" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1398 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1454 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover" -#: cmdline/apt-get.cc:1503 +#: cmdline/apt-get.cc:1501 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1505 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用 'apt-get autoremove' 來將其移除。" -#: cmdline/apt-get.cc:1511 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1032,43 +1044,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "以下的資訊或許有助於解決當前的情況：" -#: cmdline/apt-get.cc:1518 +#: cmdline/apt-get.cc:1516 msgid "Internal Error, AutoRemover broke stuff" msgstr "內部錯誤，AutoRemover 處理失敗" -#: cmdline/apt-get.cc:1537 +#: cmdline/apt-get.cc:1535 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤，AllUpgrade 造成了損壞" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Couldn't find task %s" msgstr "無法找到主題 %s" -#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:1728 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1759 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-get.cc:1774 +#: cmdline/apt-get.cc:1772 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您也許得執行 `apt-get -f install' 以修正這些問題：" -#: cmdline/apt-get.cc:1777 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1076,7 +1088,7 @@ msgstr "" "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解" "決方案）。" -#: cmdline/apt-get.cc:1789 +#: cmdline/apt-get.cc:1787 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1086,122 +1098,122 @@ msgstr "" "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" -#: cmdline/apt-get.cc:1807 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1836 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "下列的額外套件將被安裝：" -#: cmdline/apt-get.cc:1925 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "建議套件：" -#: cmdline/apt-get.cc:1926 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "推薦套件：" -#: cmdline/apt-get.cc:1955 +#: cmdline/apt-get.cc:1953 msgid "Calculating upgrade... " msgstr "籌備升級中... " -#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1963 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，問題排除器造成了損壞" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2136 msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" -#: cmdline/apt-get.cc:2217 +#: cmdline/apt-get.cc:2215 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:2248 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" -#: cmdline/apt-get.cc:2254 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:2257 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:2263 +#: cmdline/apt-get.cc:2265 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:2334 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:2352 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2371 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2387 +#: cmdline/apt-get.cc:2389 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:2415 +#: cmdline/apt-get.cc:2417 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:2487 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1209,30 +1221,30 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:2576 +#: cmdline/apt-get.cc:2578 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了" -#: cmdline/apt-get.cc:2603 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:2619 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:2656 +#: cmdline/apt-get.cc:2658 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:2697 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1316,7 +1328,7 @@ msgstr "" "以取得更多資訊和選項。\n" " 該 APT 有著超級牛力。\n" -#: cmdline/apt-get.cc:2864 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1728,11 +1740,11 @@ msgid "File not found" msgstr "找不到檔案" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "無法取得狀態" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "無法設定修改時間" @@ -1859,7 +1871,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "有問題的雜湊檔" @@ -1934,8 +1946,8 @@ msgid "Temporary failure resolving '%s'" msgstr "暫時無法解析 '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "在解析 '%s:%s' (%i) 時出了怪事" #: methods/connect.cc:240 @@ -2023,47 +2035,47 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:888 +#: methods/http.cc:889 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "無法截短檔案" -#: methods/http.cc:1146 +#: methods/http.cc:1147 msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "內部錯誤" @@ -2071,12 +2083,12 @@ msgstr "內部錯誤" msgid "Can't mmap an empty file" msgstr "不能 mmap 空白檔案" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "無法 mmap 到 %lu 位元組" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " @@ -2085,6 +2097,13 @@ msgstr "" "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%lu。" "(man 5 apt.conf)" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format @@ -2470,7 +2489,14 @@ msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）" -#: apt-pkg/packagemanager.cc:436 +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2480,6 +2506,13 @@ msgstr "" "此安裝因衝突或預先相依關係，需暫時刪除 %s 這個基本套件。這通常不是好主意，但" "若您執意進行，請設定 APT::Force-LoopBreak 選項。" +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2684,19 +2717,19 @@ msgstr "在儲存來源快取時 IO 錯誤" msgid "rename failed, %s (%s -> %s)." msgstr "無法重新命名，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "無法取得以下的密鑰 ID 的公鑰：\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2705,20 +2738,20 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1324 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "大小不符" @@ -2944,14 +2977,27 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "無法修補檔案" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "連線突然終止" +#~ msgid "Could not patch file" +#~ msgstr "無法修補檔案" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" -- cgit v1.2.3-70-g09d2 From acdd8da1f53c69e8d3a8e3c8430470752aa3df3a Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Thu, 10 Dec 2009 23:28:57 +0100 Subject: * apt-pkg/init.h: - add compatibilty with old ABI name until the next ABI break --- apt-pkg/init.h | 4 +++- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/init.h b/apt-pkg/init.h index f0757f644..dde4cf679 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -21,7 +21,9 @@ // reverse-dependencies of libapt-pkg against the new SONAME. // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak -#define APT_PKG_MAJOR 4 +// FIXME: this needs to be changed to "4" (without quotes) on the next +// ABI break +#define APT_PKG_MAJOR libc6.10-6-4 #define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 diff --git a/debian/changelog b/debian/changelog index 1f4fa38b8..64e676709 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low (thanks also to Jussi Hakala and Julian Andres Klode) * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions + * apt-pkg/init.h: + - add compatibilty with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3-70-g09d2 From bb1293d975294884a95b9cb298432c9cf9ecc995 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:23:18 +0100 Subject: Backport rred patches from my own sid branch to the 0.7.25 branch * rewrite and refactor rred method to be able to handle even big (>30 MB) patches (Closes: #554349) and hardening the method itself by using more constants and a return value which can't be misinterpreted as linenumber * Finally adope the patch from Morten Hustveit <morten@debian.org> to be able to optional use mmaps and iovec to increase patch speed - but as this increase memory usage we can always fall back to the "old" method which doesn't depend on mmaps. --- debian/changelog | 4 + methods/rred.cc | 648 +++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 468 insertions(+), 184 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64e676709..c54fb431b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,10 @@ apt (0.7.25) UNRELEASED; urgency=low - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) + * methods/rred.cc: + - rewrite to be able to handle even big patch files + - adopt optional mmap+iovec patch from Morten Hustveit + (Closes: #463354) which should speed up a bit. Thanks! [ Chris Leick ] * doc/ various manpages: diff --git a/methods/rred.cc b/methods/rred.cc index 27d95bdde..262c78cab 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -1,202 +1,443 @@ +// Includes /*{{{*/ #include <apt-pkg/fileutl.h> +#include <apt-pkg/mmap.h> #include <apt-pkg/error.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/strutl.h> #include <apt-pkg/hashes.h> #include <sys/stat.h> +#include <sys/uio.h> #include <unistd.h> #include <utime.h> #include <stdio.h> #include <errno.h> #include <apti18n.h> - -/* this method implements a patch functionality similar to "patch --ed" that is - * used by the "tiffany" incremental packages download stuff. it differs from - * "ed" insofar that it is way more restricted (and therefore secure). in the - * moment only the "c", "a" and "d" commands of ed are implemented (diff - * doesn't output any other). additionally the records must be reverse sorted - * by line number and may not overlap (diff *seems* to produce this kind of - * output). + /*}}}*/ +/** \brief RredMethod - ed-style incremential patch method {{{ + * + * This method implements a patch functionality similar to "patch --ed" that is + * used by the "tiffany" incremental packages download stuff. It differs from + * "ed" insofar that it is way more restricted (and therefore secure). + * The currently supported ed commands are "<em>c</em>hange", "<em>a</em>dd" and + * "<em>d</em>elete" (diff doesn't output any other). + * Additionally the records must be reverse sorted by line number and + * may not overlap (diff *seems* to produce this kind of output). * */ +class RredMethod : public pkgAcqMethod { + bool Debug; + // the size of this doesn't really matter (except for performance) + const static int BUF_SIZE = 1024; + // the supported ed commands + enum Mode {MODE_CHANGED='c', MODE_DELETED='d', MODE_ADDED='a'}; + // return values + enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED}; -const char *Prog; + State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, + unsigned long &line, char *buffer, Hashes *hash) const; + void ignoreLineInFile(FILE *fin, char *buffer) const; + void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines, + Hashes *hash, char *buffer) const; -class RredMethod : public pkgAcqMethod -{ - bool Debug; - // the size of this doesn't really matter (except for performance) - const static int BUF_SIZE = 1024; - // the ed commands - enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED}; - // return values - enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE}; - // this applies a single hunk, it uses a tail recursion to - // reverse the hunks in the file - int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash); - // apply a patch file - int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash); - // the methods main method - virtual bool Fetch(FetchItem *Itm); - - public: - - RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; + State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; + State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const; + +protected: + // the methods main method + virtual bool Fetch(FetchItem *Itm); + +public: + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; }; + /*}}}*/ +/** \brief applyFile - in reverse order with a tail recursion {{{ + * + * As it is expected that the commands are in reversed order in the patch file + * we check in the first half if the command is valid, but doesn't execute it + * and move a step deeper. After reaching the end of the file we apply the + * patches in the correct order: last found command first. + * + * \param ed_cmds patch file to apply + * \param in_file base file we want to patch + * \param out_file file to write the patched result to + * \param line of command operation + * \param buffer internal used read/write buffer + * \param hash the created file for correctness + * \return the success State of the ed command executor + */ +RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file, + unsigned long &line, char *buffer, Hashes *hash) const { + // get the current command and parse it + if (fgets(buffer, BUF_SIZE, ed_cmds) == NULL) { + if (Debug == true) + std::clog << "rred: encounter end of file - we can start patching now." << std::endl; + line = 0; + return ED_OK; + } -int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line, - char *buffer, unsigned int bufsize, Hashes *hash) { - int pos; - int startline; - int stopline; - int mode; - int written; - char *idx; - - /* get the current command and parse it*/ - if (fgets(buffer, bufsize, ed_cmds) == NULL) { - return line; - } - startline = strtol(buffer, &idx, 10); - if (startline < line) { - return ED_ORDERING; - } - if (*idx == ',') { - idx++; - stopline = strtol(idx, &idx, 10); - } - else { - stopline = startline; - } - if (*idx == 'c') { - mode = MODE_CHANGED; - if (Debug == true) { - std::clog << "changing from line " << startline - << " to " << stopline << std::endl; - } - } - else if (*idx == 'a') { - mode = MODE_ADDED; - if (Debug == true) { - std::clog << "adding after line " << startline << std::endl; - } - } - else if (*idx == 'd') { - mode = MODE_DELETED; - if (Debug == true) { - std::clog << "deleting from line " << startline - << " to " << stopline << std::endl; - } - } - else { - return ED_PARSER; - } - /* get the current position */ - pos = ftell(ed_cmds); - /* if this is add or change then go to the next full stop */ - if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) { - do { - fgets(buffer, bufsize, ed_cmds); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - buffer[0] = ' '; - } - } while (strncmp(buffer, ".", 1) != 0); - } - /* do the recursive call */ - line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize, - hash); - /* pass on errors */ - if (line < 0) { - return line; - } - /* apply our hunk */ - fseek(ed_cmds, pos, SEEK_SET); - /* first wind to the current position */ - if (mode != MODE_ADDED) { - startline -= 1; - } - while (line < startline) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - line++; - } - /* include from ed script */ - if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) { - do { - fgets(buffer, bufsize, ed_cmds); - if (strncmp(buffer, ".", 1) != 0) { - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, ed_cmds); - written = fwrite(buffer, 1, strlen(buffer), out_file); - hash->Add((unsigned char*)buffer, written); - } - } - else { - break; - } - } while (1); - } - /* ignore the corresponding number of lines from input */ - if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) { - while (line < stopline) { - fgets(buffer, bufsize, in_file); - while ((strlen(buffer) == (bufsize - 1)) - && (buffer[bufsize - 2] != '\n')) { - fgets(buffer, bufsize, in_file); - } - line++; - } - } - return line; -} + // parse in the effected linenumbers + char* idx; + errno=0; + unsigned long const startline = strtol(buffer, &idx, 10); + if (errno == ERANGE || errno == EINVAL) { + _error->Errno("rred", "startline is an invalid number"); + return ED_PARSER; + } + if (startline > line) { + _error->Error("rred: The start line (%lu) of the next command is higher than the last line (%lu). This is not allowed.", startline, line); + return ED_ORDERING; + } + unsigned long stopline; + if (*idx == ',') { + idx++; + errno=0; + stopline = strtol(idx, &idx, 10); + if (errno == ERANGE || errno == EINVAL) { + _error->Errno("rred", "stopline is an invalid number"); + return ED_PARSER; + } + } + else { + stopline = startline; + } + line = startline; + + // which command to execute on this line(s)? + switch (*idx) { + case MODE_CHANGED: + if (Debug == true) + std::clog << "Change from line " << startline << " to " << stopline << std::endl; + break; + case MODE_ADDED: + if (Debug == true) + std::clog << "Insert after line " << startline << std::endl; + break; + case MODE_DELETED: + if (Debug == true) + std::clog << "Delete from line " << startline << " to " << stopline << std::endl; + break; + default: + _error->Error("rred: Unknown ed command '%c'. Abort.", *idx); + return ED_PARSER; + } + unsigned char mode = *idx; + + // save the current position + unsigned const long pos = ftell(ed_cmds); + + // if this is add or change then go to the next full stop + unsigned int data_length = 0; + if (mode == MODE_CHANGED || mode == MODE_ADDED) { + do { + ignoreLineInFile(ed_cmds, buffer); + data_length++; + } + while (strncmp(buffer, ".", 1) != 0); + data_length--; // the dot should not be copied + } + + // do the recursive call - the last command is the one we need to execute at first + const State child = applyFile(ed_cmds, in_file, out_file, line, buffer, hash); + if (child != ED_OK) { + return child; + } + + // change and delete are working on "line" - add is done after "line" + if (mode != MODE_ADDED) + line++; + + // first wind to the current position and copy over all unchanged lines + if (line < startline) { + copyLinesFromFileToFile(in_file, out_file, (startline - line), hash, buffer); + line = startline; + } -int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, - Hashes *hash) { + if (mode != MODE_ADDED) + line--; + + // include data from ed script + if (mode == MODE_CHANGED || mode == MODE_ADDED) { + fseek(ed_cmds, pos, SEEK_SET); + copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer); + } + + // ignore the corresponding number of lines from input + if (mode == MODE_CHANGED || mode == MODE_DELETED) { + while (line < stopline) { + ignoreLineInFile(in_file, buffer); + line++; + } + } + return ED_OK; +} + /*}}}*/ +void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,/*{{{*/ + Hashes *hash, char *buffer) const { + while (0 < lines--) { + do { + fgets(buffer, BUF_SIZE, fin); + size_t const written = fwrite(buffer, 1, strlen(buffer), fout); + hash->Add((unsigned char*)buffer, written); + } while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n'); + } +} + /*}}}*/ +void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const { /*{{{*/ + fgets(buffer, BUF_SIZE, fin); + while (strlen(buffer) == (BUF_SIZE - 1) && + buffer[BUF_SIZE - 2] != '\n') { + fgets(buffer, BUF_SIZE, fin); + buffer[0] = ' '; + } +} + /*}}}*/ +RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ + FileFd &out_file, Hashes *hash) const { char buffer[BUF_SIZE]; - int result; - int written; - + FILE* fFrom = fdopen(From.Fd(), "r"); + FILE* fPatch = fdopen(Patch.Fd(), "r"); + FILE* fTo = fdopen(out_file.Fd(), "w"); + /* we do a tail recursion to read the commands in the right order */ - result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE, - hash); + unsigned long line = -1; // assign highest possible value + State const result = applyFile(fPatch, fFrom, fTo, line, buffer, hash); /* read the rest from infile */ - if (result >= 0) { - while (fgets(buffer, BUF_SIZE, in_file) != NULL) { - written = fwrite(buffer, 1, strlen(buffer), out_file); + if (result == ED_OK) { + while (fgets(buffer, BUF_SIZE, fFrom) != NULL) { + size_t const written = fwrite(buffer, 1, strlen(buffer), fTo); hash->Add((unsigned char*)buffer, written); } + fflush(fTo); } - else { - return ED_FAILURE; - } - return ED_OK; + return result; } + /*}}}*/ +struct EdCommand { /*{{{*/ + size_t data_start; + size_t data_end; + size_t data_lines; + size_t first_line; + size_t last_line; + char type; +}; +#define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */ + /*}}}*/ +RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ + FileFd &out_file, Hashes *hash) const { +#ifdef _POSIX_MAPPED_FILES + MMap ed_cmds(Patch, MMap::ReadOnly); + MMap in_file(From, MMap::ReadOnly); + + if (ed_cmds.Size() == 0 || in_file.Size() == 0) + return MMAP_FAILED; + + EdCommand* commands = 0; + size_t command_count = 0; + size_t command_alloc = 0; + + const char* begin = (char*) ed_cmds.Data(); + const char* end = begin; + const char* ed_end = (char*) ed_cmds.Data() + ed_cmds.Size(); + + const char* input = (char*) in_file.Data(); + const char* input_end = (char*) in_file.Data() + in_file.Size(); + + size_t i; + + /* 1. Parse entire script. It is executed in reverse order, so we cather it + * in the `commands' buffer first + */ + + for(;;) { + EdCommand cmd; + cmd.data_start = 0; + cmd.data_end = 0; + + while(begin != ed_end && *begin == '\n') + ++begin; + while(end != ed_end && *end != '\n') + ++end; + if(end == ed_end && begin == end) + break; + + /* Determine command range */ + const char* tmp = begin; + + for(;;) { + /* atoll is safe despite lacking NUL-termination; we know there's an + * alphabetic character at end[-1] + */ + if(tmp == end) { + cmd.first_line = atol(begin); + cmd.last_line = cmd.first_line; + break; + } + if(*tmp == ',') { + cmd.first_line = atol(begin); + cmd.last_line = atol(tmp + 1); + break; + } + ++tmp; + } + + // which command to execute on this line(s)? + switch (end[-1]) { + case MODE_CHANGED: + if (Debug == true) + std::clog << "Change from line " << cmd.first_line << " to " << cmd.last_line << std::endl; + break; + case MODE_ADDED: + if (Debug == true) + std::clog << "Insert after line " << cmd.first_line << std::endl; + break; + case MODE_DELETED: + if (Debug == true) + std::clog << "Delete from line " << cmd.first_line << " to " << cmd.last_line << std::endl; + break; + default: + _error->Error("rred: Unknown ed command '%c'. Abort.", end[-1]); + free(commands); + return ED_PARSER; + } + cmd.type = end[-1]; + + /* Determine the size of the inserted text, so we don't have to scan this + * text again later. + */ + begin = end + 1; + end = begin; + cmd.data_lines = 0; + + if(cmd.type == MODE_ADDED || cmd.type == MODE_CHANGED) { + cmd.data_start = begin - (char*) ed_cmds.Data(); + while(end != ed_end) { + if(*end == '\n') { + if(end[-1] == '.' && end[-2] == '\n') + break; + ++cmd.data_lines; + } + ++end; + } + cmd.data_end = end - (char*) ed_cmds.Data() - 1; + begin = end + 1; + end = begin; + } + if(command_count == command_alloc) { + command_alloc = (command_alloc + 64) * 3 / 2; + commands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand)); + } + commands[command_count++] = cmd; + } + + struct iovec* iov = new struct iovec[IOV_COUNT]; + size_t iov_size = 0; + + size_t amount, remaining; + size_t line = 1; + EdCommand* cmd; + + /* 2. Execute script. We gather writes in a `struct iov' array, and flush + * using writev to minimize the number of system calls. Data is read + * directly from the memory mappings of the input file and the script. + */ + + for(i = command_count; i-- > 0; ) { + cmd = &commands[i]; + if(cmd->type == MODE_ADDED) + amount = cmd->first_line + 1; + else + amount = cmd->first_line; + + if(line < amount) { + begin = input; + while(line != amount) { + input = (const char*) memchr(input, '\n', input_end - input); + if(!input) + break; + ++line; + ++input; + } + iov[iov_size].iov_base = (void*) begin; + iov[iov_size].iov_len = input - begin; + hash->Add((const unsigned char*) begin, input - begin); -bool RredMethod::Fetch(FetchItem *Itm) + if(++iov_size == IOV_COUNT) { + writev(out_file.Fd(), iov, IOV_COUNT); + iov_size = 0; + } + } + + if(cmd->type == MODE_DELETED || cmd->type == MODE_CHANGED) { + remaining = (cmd->last_line - cmd->first_line) + 1; + line += remaining; + while(remaining) { + input = (const char*) memchr(input, '\n', input_end - input); + if(!input) + break; + --remaining; + ++input; + } + } + + if(cmd->type == MODE_CHANGED || cmd->type == MODE_ADDED) { + if(cmd->data_end != cmd->data_start) { + iov[iov_size].iov_base = (void*) ((char*)ed_cmds.Data() + cmd->data_start); + iov[iov_size].iov_len = cmd->data_end - cmd->data_start; + hash->Add((const unsigned char*) ((char*)ed_cmds.Data() + cmd->data_start), + iov[iov_size].iov_len); + + if(++iov_size == IOV_COUNT) { + writev(out_file.Fd(), iov, IOV_COUNT); + iov_size = 0; + } + } + } + } + + if(input != input_end) { + iov[iov_size].iov_base = (void*) input; + iov[iov_size].iov_len = input_end - input; + hash->Add((const unsigned char*) input, input_end - input); + ++iov_size; + } + + if(iov_size) { + writev(out_file.Fd(), iov, iov_size); + iov_size = 0; + } + + for(i = 0; i < iov_size; i += IOV_COUNT) { + if(iov_size - i < IOV_COUNT) + writev(out_file.Fd(), iov + i, iov_size - i); + else + writev(out_file.Fd(), iov + i, IOV_COUNT); + } + + delete [] iov; + free(commands); + + return ED_OK; +#else + return MMAP_FAILED; +#endif +} + /*}}}*/ +bool RredMethod::Fetch(FetchItem *Itm) /*{{{*/ { - Debug = _config->FindB("Debug::pkgAcquire::RRed",false); + Debug = _config->FindB("Debug::pkgAcquire::RRed", false); URI Get = Itm->Uri; string Path = Get.Host + Get.Path; // To account for relative paths - // Path contains the filename to patch + FetchResult Res; Res.Filename = Itm->DestFile; - URIStart(Res); - // Res.Filename the destination filename + if (Itm->Uri.empty() == true) { + Path = Itm->DestFile; + Itm->DestFile.append(".result"); + } else + URIStart(Res); if (Debug == true) std::clog << "Patching " << Path << " with " << Path @@ -211,19 +452,27 @@ bool RredMethod::Fetch(FetchItem *Itm) return false; Hashes Hash; - FILE* fFrom = fdopen(From.Fd(), "r"); - FILE* fPatch = fdopen(Patch.Fd(), "r"); - FILE* fTo = fdopen(To.Fd(), "w"); // now do the actual patching - if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) { - _error->Errno("rred", _("Could not patch file")); - return false; + State const result = patchMMap(Patch, From, To, &Hash); + if (result == MMAP_FAILED) { + // retry with patchFile + lseek(Patch.Fd(), 0, SEEK_SET); + lseek(From.Fd(), 0, SEEK_SET); + To.Open(Itm->DestFile,FileFd::WriteEmpty); + if (_error->PendingError() == true) + return false; + if (patchFile(Patch, From, To, &Hash) != ED_OK) { + return _error->WarningE("rred", _("Could not patch %s with mmap and with file operation usage - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished file patching of " << Path << " after mmap failed." << std::endl; + } + } else if (result != ED_OK) { + return _error->Errno("rred", _("Could not patch %s with mmap (but no mmap specific fail) - the patch seems to be corrupt."), Path.c_str()); + } else if (Debug == true) { + std::clog << "rred: finished mmap patching of " << Path << std::endl; } // write out the result - fflush(fFrom); - fflush(fPatch); - fflush(fTo); From.Close(); Patch.Close(); To.Close(); @@ -250,13 +499,44 @@ bool RredMethod::Fetch(FetchItem *Itm) return true; } - -int main(int argc, char *argv[]) -{ - RredMethod Mth; - - Prog = strrchr(argv[0],'/'); - Prog++; - - return Mth.Run(); + /*}}}*/ +/** \brief Wrapper class for testing rred */ /*{{{*/ +class TestRredMethod : public RredMethod { +public: + /** \brief Run rred in debug test mode + * + * This method can be used to run the rred method outside + * of the "normal" acquire environment for easier testing. + * + * \param base basename of all files involved in this rred test + */ + bool Run(char const *base) { + _config->CndSet("Debug::pkgAcquire::RRed", "true"); + FetchItem *test = new FetchItem; + test->DestFile = base; + return Fetch(test); + } +}; + /*}}}*/ +/** \brief Starter for the rred method (or its test method) {{{ + * + * Used without parameters is the normal behavior for methods for + * the APT acquire system. While this works great for the acquire system + * it is very hard to test the method and therefore the method also + * accepts one parameter which will switch it directly to debug test mode: + * The test mode expects that if "Testfile" is given as parameter + * the file "Testfile" should be ed-style patched with "Testfile.ed" + * and will write the result to "Testfile.result". + */ +int main(int argc, char *argv[]) { + if (argc <= 1) { + RredMethod Mth; + return Mth.Run(); + } else { + TestRredMethod Mth; + bool result = Mth.Run(argv[1]); + _error->DumpErrors(); + return result; + } } + /*}}}*/ -- cgit v1.2.3-70-g09d2 From 9f542bae2b3620887345ebc3e61970f8903123a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:32:01 +0100 Subject: add config setting for User-Agent in http and https to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) --- debian/changelog | 3 +++ doc/apt.conf.5.xml | 7 ++++++- doc/examples/configure-index | 3 +++ methods/http.cc | 3 ++- methods/https.cc | 5 ++++- 5 files changed, 18 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c54fb431b..0cfd36c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,9 @@ apt (0.7.25) UNRELEASED; urgency=low - rewrite to be able to handle even big patch files - adopt optional mmap+iovec patch from Morten Hustveit (Closes: #463354) which should speed up a bit. Thanks! + * methods/http{,s}.cc + - add config setting for User-Agent to the Acquire group, + thanks Timothy J. Miller! (Closes: #355782) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e2db9defb..726bca2cc 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -275,7 +275,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</literal> which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit - deactivates the download from multiple servers at the same time.)</para></listitem> + deactivates the download from multiple servers at the same time.)</para> + + <para><literal>Acquire::http::User-Agent</literal> can be used to set a different + User-Agent for the http download method as some proxies allow access for clients + only if the client uses a known identifier.</para> + </listitem> </varlistentry> <varlistentry><term>https</term> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f5f996460..333c8df7e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -191,6 +191,7 @@ Acquire Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives Dl-Limit "7"; // 7Kb/sec maximum download rate + User-Agent "Debian APT-HTTP/1.3"; }; // HTTPS method configuration: @@ -204,6 +205,8 @@ Acquire CaPath "/etc/ssl/certs"; Verify-Host" "true"; AllowRedirect "true"; + + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/http.cc b/methods/http.cc index 3b210f6b6..2dae87a02 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -731,7 +731,8 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) Req += string("Authorization: Basic ") + Base64Encode(Uri.User + ":" + Uri.Password) + "\r\n"; } - Req += "User-Agent: Debian APT-HTTP/1.3 ("VERSION")\r\n\r\n"; + Req += "User-Agent: " + _config->Find("Acquire::http::User-Agent", + "Debian APT-HTTP/1.3 ("VERSION")") + "\r\n\r\n"; if (Debug == true) cerr << Req << endl; diff --git a/methods/https.cc b/methods/https.cc index 86d7f3a6b..a4f39c379 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -211,7 +211,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); // set header - curl_easy_setopt(curl, CURLOPT_USERAGENT,"Debian APT-CURL/1.0 ("VERSION")"); + curl_easy_setopt(curl, CURLOPT_USERAGENT, + _config->Find("Acquire::https::User-Agent", + _config->Find("Acquire::http::User-Agent", + "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout int timeout = _config->FindI("Acquire::http::Timeout",120); -- cgit v1.2.3-70-g09d2 From b9e9a44b3377cae2fb9aca3210f379ae1cb802ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:38:13 +0100 Subject: add https options which default to the ones from http for the https method as this is more sane than using only the http options without a possibility to override these for https. --- debian/changelog | 2 + doc/apt.conf.5.xml | 8 ++-- doc/examples/configure-index | 33 ++++++++++---- methods/https.cc | 100 +++++++++++++++++++------------------------ 4 files changed, 76 insertions(+), 67 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0cfd36c00..e930de0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure + - briefly document the behaviour of the new https options * doc/sources.list.5.xml: - add note about additional apt-transport-methods * doc/apt-mark.8.xml: @@ -97,6 +98,7 @@ apt (0.7.25) UNRELEASED; urgency=low * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) + - add https options which default to http ones (Closes: #557085) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 726bca2cc..d7ad51cfb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> <varlistentry><term>https</term> - <listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for - <literal>http</literal> method. - <literal>Pipeline-Depth</literal> option is not supported yet.</para> + <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and + proxy options are the same as for <literal>http</literal> method and will also + default to the options from the <literal>http</literal> method if they are not + explicitly set for https. <literal>Pipeline-Depth</literal> option is not + supported yet.</para> <para><literal>CaInfo</literal> suboption specifies place of file that holds info about trusted certificates. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 333c8df7e..ced390447 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -194,19 +194,34 @@ Acquire User-Agent "Debian APT-HTTP/1.3"; }; - // HTTPS method configuration: - // - uses the http proxy config - // - uses the http cache-control values - // - uses the http Dl-Limit values - https + + + // HTTPS method configuration: uses the http + // - proxy config + // - cache-control values + // - Dl-Limit, Timout, ... values + // if not set explicit for https + // + // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz + // for more examples + https { Verify-Peer "false"; SslCert "/etc/apt/some.pem"; - CaPath "/etc/ssl/certs"; - Verify-Host" "true"; - AllowRedirect "true"; + CaPath "/etc/ssl/certs"; + Verify-Host" "true"; + AllowRedirect "true"; + + Timeout "120"; + AllowRedirect "true"; + + // Cache Control. Note these do not work with Squid 2.0.2 + No-Cache "false"; + Max-Age "86400"; // 1 Day age on index files + No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate - User-Agent "Debian APT-CURL/1.0"; + User-Agent "Debian APT-CURL/1.0"; }; ftp diff --git a/methods/https.cc b/methods/https.cc index a4f39c379..ed1f18150 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -1,4 +1,4 @@ -// -*- mode: cpp; mode: fold -*- +//-*- mode: cpp; mode: fold -*- // Description /*{{{*/ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### @@ -57,54 +57,38 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, return 0; } -void HttpsMethod::SetupProxy() -{ - URI ServerName = Queue->Uri; - - // Determine the proxy setting - string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host); - if (!SpecificProxy.empty()) - { - if (SpecificProxy == "DIRECT") - Proxy = ""; - else - Proxy = SpecificProxy; - } - else - { - string DefProxy = _config->Find("Acquire::http::Proxy"); - if (!DefProxy.empty()) - { - Proxy = DefProxy; - } - else - { - char* result = getenv("http_proxy"); - Proxy = result ? result : ""; - } - } - - // Parse no_proxy, a , separated list of domains - if (getenv("no_proxy") != 0) - { - if (CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) - Proxy = ""; - } - - // Determine what host and port to use based on the proxy settings - string Host; - if (Proxy.empty() == true || Proxy.Host.empty() == true) - { - } - else - { - if (Proxy.Port != 0) - curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); - curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); - } -} - - +void HttpsMethod::SetupProxy() { /*{{{*/ + URI ServerName = Queue->Uri; + + // Determine the proxy setting - try https first, fallback to http and use env at last + string UseProxy = _config->Find("Acquire::https::Proxy::" + ServerName.Host, + _config->Find("Acquire::http::Proxy::" + ServerName.Host)); + + if (UseProxy.empty() == true) + UseProxy = _config->Find("Acquire::https::Proxy", _config->Find("Acquire::http::Proxy")); + + // User want to use NO proxy, so nothing to setup + if (UseProxy == "DIRECT") + return; + + if (UseProxy.empty() == false) { + // Parse no_proxy, a comma (,) separated list of domains we don't want to use + // a proxy for so we stop right here if it is in the list + if (getenv("no_proxy") != 0 && CheckDomainList(ServerName.Host,getenv("no_proxy")) == true) + return; + } else { + const char* result = getenv("http_proxy"); + UseProxy = result == NULL ? "" : result; + } + + // Determine what host and port to use based on the proxy settings + if (UseProxy.empty() == false) { + Proxy = UseProxy; + if (Proxy.Port != 1) + curl_easy_setopt(curl, CURLOPT_PROXYPORT, Proxy.Port); + curl_easy_setopt(curl, CURLOPT_PROXY, Proxy.Host.c_str()); + } +} /*}}}*/ // HttpsMethod::Fetch - Fetch an item /*{{{*/ // --------------------------------------------------------------------- /* This adds an item to the pipeline. We keep the pipeline at a fixed @@ -191,12 +175,15 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_SSLVERSION, final_version); // cache-control - if(_config->FindB("Acquire::http::No-Cache",false) == false) + if(_config->FindB("Acquire::https::No-Cache", + _config->FindB("Acquire::http::No-Cache",false)) == false) { // cache enabled - if (_config->FindB("Acquire::http::No-Store",false) == true) + if (_config->FindB("Acquire::https::No-Store", + _config->FindB("Acquire::http::No-Store",false)) == true) headers = curl_slist_append(headers,"Cache-Control: no-store"); - ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::http::Max-Age",0)); + ioprintf(ss, "Cache-Control: max-age=%u", _config->FindI("Acquire::https::Max-Age", + _config->FindI("Acquire::http::Max-Age",0))); headers = curl_slist_append(headers, ss.str().c_str()); } else { // cache disabled by user @@ -206,7 +193,8 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); // speed limit - int dlLimit = _config->FindI("Acquire::http::Dl-Limit",0)*1024; + int dlLimit = _config->FindI("Acquire::https::Dl-Limit", + _config->FindI("Acquire::http::Dl-Limit",0))*1024; if (dlLimit > 0) curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, dlLimit); @@ -217,14 +205,16 @@ bool HttpsMethod::Fetch(FetchItem *Itm) "Debian APT-CURL/1.0 ("VERSION")"))); // set timeout - int timeout = _config->FindI("Acquire::http::Timeout",120); + int timeout = _config->FindI("Acquire::https::Timeout", + _config->FindI("Acquire::http::Timeout",120)); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, timeout); //set really low lowspeed timeout (see #497983) curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, DL_MIN_SPEED); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, timeout); // set redirect options and default to 10 redirects - bool AllowRedirect = _config->FindI("Acquire::https::AllowRedirect", true); + bool AllowRedirect = _config->FindB("Acquire::https::AllowRedirect", + _config->FindB("Acquire::http::AllowRedirect",true)); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, AllowRedirect); curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 10); -- cgit v1.2.3-70-g09d2 From d746ad6e049c472339003396f934e8ee93a0a378 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:42:43 +0100 Subject: add AI_ADDRCONFIG to ai_flags in connect.cc as suggested by Aurelien Jarno in his response to Bernhard R. Link's patch, thanks! (Closes: #505020) --- debian/changelog | 2 ++ methods/connect.cc | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e930de0dd..b8e435330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors + - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno + in response to Bernhard R. Link, thanks! (Closes: #505020) * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead diff --git a/methods/connect.cc b/methods/connect.cc index 74e670ebd..adb16a199 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -158,6 +158,7 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, struct addrinfo Hints; memset(&Hints,0,sizeof(Hints)); Hints.ai_socktype = SOCK_STREAM; + Hints.ai_flags = AI_ADDRCONFIG; Hints.ai_protocol = 0; // if we couldn't resolve the host before, we don't try now -- cgit v1.2.3-70-g09d2 From 879cbcc8685781ba6f89a9123acd50c794490f2c Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:44:32 +0100 Subject: check cache size even if we do nothing else otherwise in apt.cron.daily, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) --- debian/apt.cron.daily | 6 +++++- debian/changelog | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index b6099ee75..e59b05ee4 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -401,12 +401,16 @@ eval $(apt-config shell BackupArchiveInterval APT::Periodic::BackupArchiveInterv Debdelta=1 eval $(apt-config shell Debdelta APT::Periodic::Download-Upgradeable-Packages-Debdelta) -# check if we actually have to do anything +# check if we actually have to do anything that requires locking the cache if [ $UpdateInterval -eq 0 ] && [ $DownloadUpgradeableInterval -eq 0 ] && [ $UnattendedUpgradeInterval -eq 0 ] && [ $BackupArchiveInterval -eq 0 ] && [ $AutocleanInterval -eq 0 ]; then + + # check cache size + check_size_constraints + exit 0 fi diff --git a/debian/changelog b/debian/changelog index b8e435330..7fa06e02c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,9 @@ apt (0.7.25) UNRELEASED; urgency=low - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) - add https options which default to http ones (Closes: #557085) + * debian/apt.cron.daily: + - check cache size even if we do nothing else otherwise, thanks + Francesco Poli for patch(s) and patience! (Closes: #459344) [ Chris Leick ] * doc/ various manpages: -- cgit v1.2.3-70-g09d2 From ca4907db7c8ec2d409a9ca32aeb2ccb4c3cd40aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Fri, 11 Dec 2009 00:48:52 +0100 Subject: fix a few typos in strings, comments and manpage of apt-ftparchive thanks Karl Goetz! (Closes: #558757) --- debian/changelog | 3 +++ doc/apt-ftparchive.1.xml | 2 +- ftparchive/apt-ftparchive.cc | 4 ++-- ftparchive/cachedb.cc | 6 +++--- ftparchive/contents.cc | 2 +- ftparchive/multicompress.cc | 2 +- ftparchive/writer.cc | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7fa06e02c..af68b8ec2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,9 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/apt.cron.daily: - check cache size even if we do nothing else otherwise, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) + * ftparchive/*: + - fix a few typos in strings, comments and manpage, + thanks Karl Goetz! (Closes: #558757) [ Chris Leick ] * doc/ various manpages: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d47df957a..fb1b10adc 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -285,7 +285,7 @@ <varlistentry><term>Sources</term> <listitem><para> - Sets the output Packages file. Defaults to + Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem> </varlistentry> diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index d0dea7768..5b6b3940c 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -3,7 +3,7 @@ // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $ /* ###################################################################### - apt-scanpackages - Efficient work-alike for dpkg-scanpackages + apt-ftparchive - Efficient work-alike for dpkg-scanpackages Let contents be disabled from the conf @@ -792,7 +792,7 @@ bool Generate(CommandLine &CmdL) if (_config->FindB("APT::FTPArchive::Contents",true) == false) return true; - c1out << "Done Packages, Starting contents." << endl; + c1out << "Packages done, Starting contents." << endl; // Sort the contents file list by date string ArchiveDir = Setup.FindDir("Dir::ArchiveDir"); diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index dfda827b6..e02f0e1b6 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -69,7 +69,7 @@ bool CacheDB::ReadyDB(string DB) // apt 0.6.44 if (err == EINVAL) { - _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + _error->Error(_("DB format is invalid. If you upgraded from an older version of apt, please remove and re-create the database.")); } if (err) { @@ -83,7 +83,7 @@ bool CacheDB::ReadyDB(string DB) return true; } /*}}}*/ -// CacheDB::OpenFile - Open the filei /*{{{*/ +// CacheDB::OpenFile - Open the file /*{{{*/ // --------------------------------------------------------------------- /* */ bool CacheDB::OpenFile() @@ -139,7 +139,7 @@ bool CacheDB::GetCurStat() if (DBLoaded) { - /* First see if thre is anything about it + /* First see if there is anything about it in the database */ /* Get the flags (and mtime) */ diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 1f2cbcc3d..fb1438f74 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -13,7 +13,7 @@ removing the massive sort time overhead. By breaking all the pathnames into components and storing them - separately a space savings is realized by not duplicating the string + separately a space saving is realized by not duplicating the string over and over again. Ultimately this saving is sacrificed to storage of the tree structure itself but the tree structure yields a speed gain in the sorting and processing. Ultimately it takes about 5 seconds to diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 2fc8efcbf..16cef9769 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -365,7 +365,7 @@ bool MultiCompress::CloseOld(int Fd,pid_t Proc) // MultiCompress::Child - The writer child /*{{{*/ // --------------------------------------------------------------------- /* The child process forks a bunch of compression children and takes - input on FD and passes it to all the compressor childer. On the way it + input on FD and passes it to all the compressor child. On the way it computes the MD5 of the raw data. After this the raw data in the original files is compared to see if this data is new. If the data is new then the temp files are renamed, otherwise they are erased. */ diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index b2ebdca8a..4e6c9a77d 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -463,7 +463,7 @@ bool PackagesWriter::DoPackage(string FileName) SetTFRewriteData(Changes[End++], "Maintainer", NewMaint.c_str()); /* Get rid of the Optional tag. This is an ugly, ugly, ugly hack that - dpkg-scanpackages does.. Well sort of. dpkg-scanpackages just does renaming + dpkg-scanpackages does. Well sort of. dpkg-scanpackages just does renaming but dpkg does this append bit. So we do the append bit, at least that way the status file and package file will remain similar. There are other transforms but optional is the only legacy one still in use for some lazy reason. */ -- cgit v1.2.3-70-g09d2 From c0a73937424fa427972835342f12f5fbaa6d0c88 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 01:54:33 +0100 Subject: revert this commit as fast as possible (aka next ABI break) This commit sets up our faked library extension to trick the build system into building the packages with libc6.9-6 while we are actually already at libc6.10-6. Oh dear... --- apt-pkg/init.h | 2 +- buildlib/library.mak | 14 +++++++------- buildlib/libversion.mak | 7 +++++++ debian/rules | 14 +++++++------- 4 files changed, 22 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/apt-pkg/init.h b/apt-pkg/init.h index dde4cf679..b1ed5922b 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -23,7 +23,7 @@ // See also buildlib/libversion.mak // FIXME: this needs to be changed to "4" (without quotes) on the next // ABI break -#define APT_PKG_MAJOR libc6.10-6-4 +#define APT_PKG_MAJOR 4 #define APT_PKG_MINOR 8 #define APT_PKG_RELEASE 0 diff --git a/buildlib/library.mak b/buildlib/library.mak index 029e87463..2a4bb782a 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -16,11 +16,11 @@ # See defaults.mak for information about LOCAL # Some local definitions -LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR) +LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE))))) $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE))))) $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS)) -$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR) +$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LOCAL)-SLIBS := $(SLIBS) $(LOCAL)-LIBRARY := $(LIBRARY) @@ -29,7 +29,7 @@ include $(PODOMAIN_H) # Install the command hooks headers: $($(LOCAL)-HEADERS) -library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR) +library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) @@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL) -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so* # Build rules for the two symlinks -.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so -$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) +.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so +$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ -$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) +$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR) ln -sf $(<F) $@ # The binary build rule -$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) +$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak index 796c956e7..26ca86ced 100644 --- a/buildlib/libversion.mak +++ b/buildlib/libversion.mak @@ -12,3 +12,10 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in # The versionnumber is extracted from apt-inst/makefile - see also there. LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2) + +# FIXME: In previous releases this lovely variable includes +# the detected libc and libdc++ version. As this is bogus we +# want to drop this, but this a ABI break. +# And we don't want to do this now. So we hardcode a value here, +# and drop it later on (hopefully as fast as possible). +LIBEXT=-libc6.9-6 diff --git a/debian/rules b/debian/rules index f69c0cffb..d01b57cd6 100755 --- a/debian/rules +++ b/debian/rules @@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR) +LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR) +LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(LIBAPTINST_MAJOR) debian/shlibs.local: apt-pkg/makefile # We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and # one for the rest of the packages. This ensures that each package gets # the right overrides.. rm -rf $@ $@.apt $@.apt-utils - echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ + echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ + echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@ build: build/build-stamp build-doc: build/build-doc-stamp -- cgit v1.2.3-70-g09d2 From c42d68057cf711b53e9da0217a0ec54cffef4036 Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 16:28:25 +0100 Subject: refactor the current changelog a bit --- debian/changelog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index af68b8ec2..d60bdb51f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,6 @@ apt (0.7.25) UNRELEASED; urgency=low Closes: #548571 * German translation update by Holger Wansing Closes: #551534 - * German translation of manpages by Chris Leick - Closes: #552606 * Italian translation update by Milo Casagrande Closes: #555797 * Simplified Chinese translation update by Aron Xu @@ -37,7 +35,7 @@ apt (0.7.25) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions * apt-pkg/init.h: - - add compatibilty with old ABI name until the next ABI break + - add compatibility with old ABI name until the next ABI break [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: @@ -62,7 +60,7 @@ apt (0.7.25) UNRELEASED; urgency=low * doc/apt-mark.8.xml: - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440) * cmdline/apt-get.cc: - - source should displays his final pkg pick (Closes: #249383, #550952) + - source should display his final pkg pick (Closes: #249383, #550952) - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) @@ -84,11 +82,6 @@ apt (0.7.25) UNRELEASED; urgency=low - bump policy to 3.8.3 as we have no outdated manpages anymore * debian/NEWS: - fix a typo in 0.7.24: Allready -> Already (Closes: #557674) - * cmdline/apt-mark: - - print an error if a new state file can't be created, - thanks Carl Chenet! (Closes: #521289) - - print an error and exit if python-apt is not installed, - thanks Carl Chenet! (Closes: #521284) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: @@ -108,7 +101,14 @@ apt (0.7.25) UNRELEASED; urgency=low - fix a few typos in strings, comments and manpage, thanks Karl Goetz! (Closes: #558757) + [ Carl Chenet ] + * cmdline/apt-mark: + - print an error if a new state file can't be created + (Closes: #521289) and + - exit nicely if python-apt is not installed (Closes: #521284) + [ Chris Leick ] + * doc/de: German translation of manpages (Closes: #552606) * doc/ various manpages: - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: -- cgit v1.2.3-70-g09d2 From f8b832bdbe85ca315404edcf1159fb1225fddfbf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 16:32:18 +0100 Subject: remove informalexample tag which hides the programlisting in the tree section of the apt-ftparchive manpage, thanks Chris Leick for noticing it! --- debian/changelog | 2 ++ doc/apt-ftparchive.1.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d60bdb51f..2b09c9b68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -113,6 +113,8 @@ apt (0.7.25) UNRELEASED; urgency=low - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: - replace literal with emphasis tags in Archive configuration + * doc/apt-ftparchive.1.xml: + - remove informalexample tag which hides the programlisting [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index fb1b10adc..c56ff235a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -350,11 +350,11 @@ <para> When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> performs an operation similar to: -<informalexample><programlisting> + <programlisting> for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j -</programlisting></informalexample></para> + </programlisting></para> <variablelist> <varlistentry><term>Sections</term> -- cgit v1.2.3-70-g09d2 From 5d70f74c114450f001d415eea101610eedaee05b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 19:06:01 +0100 Subject: fix to other oddities observed by Chris Leick while translating in doc/apt-get.8.xml, namely: - change equivalent "for" to "to the" (purge command) - clarify --fix-broken sentence about specifying packages --- debian/changelog | 3 +++ doc/apt-get.8.xml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2b09c9b68..cd4573468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,9 @@ apt (0.7.25) UNRELEASED; urgency=low - replace literal with emphasis tags in Archive configuration * doc/apt-ftparchive.1.xml: - remove informalexample tag which hides the programlisting + * doc/apt-get.8.xml: + - change equivalent "for" to "to the" (purge command) + - clarify --fix-broken sentence about specifying packages [ Eugene V. Lyubimkin ] * apt-pkg/contib/strutl.h diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index d3c3772bd..3d22f262c 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -333,8 +333,8 @@ <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term> <listitem><para>Fix; attempt to correct a system with broken dependencies in place. This option, when used with install/remove, can omit any packages - to permit APT to deduce a likely solution. Any Package that are specified - must completely correct the problem. The option is sometimes necessary when + to permit APT to deduce a likely solution. If packages are specified, + these have to completely correct the problem. The option is sometimes necessary when running APT for the first time; APT itself does not allow broken package dependencies to exist on a system. It is possible that a system's dependency structure can be so corrupt as to require manual intervention @@ -466,7 +466,7 @@ <varlistentry><term><option>--purge</option></term> <listitem><para>Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. <option>remove --purge</option> is equivalent for + scheduled to be purged. <option>remove --purge</option> is equivalent to the <option>purge</option> command. Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem> </varlistentry> -- cgit v1.2.3-70-g09d2 From 6847d275374c198f787c4978a49e7056f65a0a3d Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Mon, 14 Dec 2009 17:45:51 +0100 Subject: merge segfault fix from Mario Sanchez Prada, many thanks (closes: #561109) --- apt-pkg/deb/dpkgpm.cc | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 6eb3b40ac..d1a275a47 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -879,7 +879,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) const char *s = _("Can not write log, openpty() " "failed (/dev/pts not mounted?)\n"); fprintf(stderr, "%s",s); - fprintf(term_out, "%s",s); + if(term_out) + fprintf(term_out, "%s",s); master = slave = -1; } else { struct termios rtt; diff --git a/debian/changelog b/debian/changelog index cd4573468..c2a253484 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.25) UNRELEASED; urgency=low - add "purge" to list of known actions * apt-pkg/init.h: - add compatibility with old ABI name until the next ABI break + * merge segfault fix from Mario Sanchez Prada, many thanks + (closes: #561109) [ Brian Murray ] * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: -- cgit v1.2.3-70-g09d2 From 82c9bbffa2a8c9d614514d24eff0842961212486 Mon Sep 17 00:00:00 2001 From: Michael Vogt <mvo@debian.org> Date: Tue, 15 Dec 2009 13:49:21 +0100 Subject: releasing version 0.7.25 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c2a253484..53dfcce12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.7.25) UNRELEASED; urgency=low +apt (0.7.25) unstable; urgency=low [ Christian Perrier ] * Fix apt-ftparchive(1) wrt description of the "-o" option. @@ -139,7 +139,7 @@ apt (0.7.25) UNRELEASED; urgency=low * debian/apt.conf.autoremove: - Add kfreebsd-image-* to the list (Closes: #558803) - -- Michael Vogt <mvo@debian.org> Thu, 10 Dec 2009 22:02:38 +0100 + -- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100 apt (0.7.24) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 068636516ff7e7686159de478eff7b4e1036f5dc Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 18 Dec 2009 11:30:22 +0100 Subject: * debian/apt.logrotate: - add to logratation * doc/examples/configure-index: - add as example --- debian/apt.logrotate | 8 ++++++++ doc/examples/configure-index | 1 + 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/apt.logrotate b/debian/apt.logrotate index 3e924d383..dfb06db2e 100644 --- a/debian/apt.logrotate +++ b/debian/apt.logrotate @@ -6,3 +6,11 @@ notifempty } +/var/log/apt/history.log { + rotate 6 + monthly + compress + missingok + notifempty +} + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f5f996460..eaea6511c 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -307,6 +307,7 @@ Dir "/" // Location of the logfile Log "var/log/apt" { Terminal "term.log"; + History "history.log"; }; }; -- cgit v1.2.3-70-g09d2 From 71422c78826cbf9513976a2b1e7e16ff987f1254 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 18 Dec 2009 11:51:01 +0100 Subject: debian/apt.logrotate: keep histories for 12 month --- debian/apt.logrotate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.logrotate b/debian/apt.logrotate index dfb06db2e..9a6e5d155 100644 --- a/debian/apt.logrotate +++ b/debian/apt.logrotate @@ -1,5 +1,5 @@ /var/log/apt/term.log { - rotate 6 + rotate 12 monthly compress missingok @@ -7,7 +7,7 @@ } /var/log/apt/history.log { - rotate 6 + rotate 12 monthly compress missingok -- cgit v1.2.3-70-g09d2 From bf07dd586e9d3c5c3640511636662196357291ba Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Wed, 23 Dec 2009 14:11:59 +0100 Subject: * cmdline/apt-get.cc: - fix apt-get source pkg=version regression (closes: #561971) --- cmdline/apt-get.cc | 24 +++++++++++++++++------- debian/changelog | 2 ++ 2 files changed, 19 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index f84c82d28..dede0137e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1299,31 +1299,41 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs, { pkgRecords::Parser &Parse = Recs.Lookup(VF); Src = Parse.SourcePkg(); + // no SourcePkg name, so it is the "binary" name + if (Src.empty() == true) + Src = TmpSrc; + // no Version, so we try the Version of the SourcePkg - + // and after that the version of the binary package if (VerTag.empty() == true) VerTag = Parse.SourceVer(); + if (VerTag.empty() == true) + VerTag = Ver.VerStr(); break; } } + if (Src.empty() == false) + break; } if (Src.empty() == true) { - if (VerTag.empty() == false) - _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str()); - else + // Sources files have no codename information + if (VerTag.empty() == true && DefRel.empty() == false) _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str()); - VerTag.clear(); DefRel.clear(); } } - if (VerTag.empty() == true && DefRel.empty() == true) + if (Src.empty() == true) { - // if we don't have a version or default release, use the CandidateVer to find the Source + // if we don't have found a fitting package yet so we will + // choose a good candidate and proceed with that. + // Maybe we will find a source later on with the right VerTag pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg); if (Ver.end() == false) { pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList()); Src = Parse.SourcePkg(); - VerTag = Parse.SourceVer(); + if (VerTag.empty() == true) + VerTag = Parse.SourceVer(); } } } diff --git a/debian/changelog b/debian/changelog index eb50b4c78..03a467cfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low * merged lp:~mvo/apt/history - this writes a /var/log/apt/history tagfile that contains details from the transaction (complements term.log) + * cmdline/apt-get.cc: + - fix apt-get source pkg=version regression (closes: #561971) -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100 -- cgit v1.2.3-70-g09d2 From 5ae004ce7a925426808635b92ec1cbaa5443bb4e Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 22 Jan 2010 20:05:11 +0100 Subject: * apt-pkg/contrib/cdromutl.cc: - fix UnmountCdrom() fails, give it a bit more time and try the umount again --- apt-pkg/contrib/cdromutl.cc | 51 ++++++++++++++++++++++++++------------------- debian/changelog | 3 +++ 2 files changed, 33 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index 0cf9697ac..6dce82fe1 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -64,35 +64,44 @@ bool UnmountCdrom(string Path) { if (IsMounted(Path) == false) return true; - - int Child = ExecFork(); - // The child - if (Child == 0) + for (int i=0;i<3;i++) { - // Make all the fds /dev/null - for (int I = 0; I != 3; I++) - dup2(open("/dev/null",O_RDWR),I); + + int Child = ExecFork(); - if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true) + // The child + if (Child == 0) { - if (system(_config->Find("Acquire::cdrom::"+Path+"::UMount").c_str()) != 0) + // Make all the fds /dev/null + for (int I = 0; I != 3; I++) + dup2(open("/dev/null",O_RDWR),I); + + if (_config->Exists("Acquire::cdrom::"+Path+"::UMount") == true) + { + if (system(_config->Find("Acquire::cdrom::"+Path+"::UMount").c_str()) != 0) + _exit(100); + _exit(0); + } + else + { + const char *Args[10]; + Args[0] = "umount"; + Args[1] = Path.c_str(); + Args[2] = 0; + execvp(Args[0],(char **)Args); _exit(100); - _exit(0); + } } - else - { - const char *Args[10]; - Args[0] = "umount"; - Args[1] = Path.c_str(); - Args[2] = 0; - execvp(Args[0],(char **)Args); - _exit(100); - } + + // if it can not be umounted, give it a bit more time + // this can happen when auto-mount magic or fs/cdrom prober attack + if (ExecWait(Child,"umount",true) == true) + return true; + sleep(1); } - // Wait for mount - return ExecWait(Child,"umount",true); + return false; } /*}}}*/ // MountCdrom - Mount a cdrom /*{{{*/ diff --git a/debian/changelog b/debian/changelog index 03a467cfa..5bb90cc1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ apt (0.7.25.1) UNRELEASED; urgency=low from the transaction (complements term.log) * cmdline/apt-get.cc: - fix apt-get source pkg=version regression (closes: #561971) + * apt-pkg/contrib/cdromutl.cc: + - fix UnmountCdrom() fails, give it a bit more time and try + the umount again -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100 -- cgit v1.2.3-70-g09d2 From bf783d9044cb5c9e851fbf10c9bb7e6192b13afd Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Fri, 22 Jan 2010 21:21:30 +0100 Subject: * methods/cdrom.cc: - fixes in multi cdrom setup code --- debian/changelog | 2 ++ methods/cdrom.cc | 20 +++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5bb90cc1d..b499d7298 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low * apt-pkg/contrib/cdromutl.cc: - fix UnmountCdrom() fails, give it a bit more time and try the umount again + * methods/cdrom.cc: + - fixes in multi cdrom setup code -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100 diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 9802eb46c..763547013 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -37,8 +37,8 @@ class CDROMMethod : public pkgAcqMethod bool MountedByApt; pkgUdevCdromDevices UdevCdroms; - bool IsCorrectCD(URI want, string MountPath); - bool AutoDetectAndMount(URI); + bool IsCorrectCD(URI want, string MountPath, string& NewID); + bool AutoDetectAndMount(URI, string &NewID); virtual bool Fetch(FetchItem *Itm); string GetID(string Name); virtual void Exit(); @@ -92,7 +92,7 @@ string CDROMMethod::GetID(string Name) // CDROMMethod::AutoDetectAndMount /*{{{*/ // --------------------------------------------------------------------- /* Modifies class varaiable CDROM to the mountpoint */ -bool CDROMMethod::AutoDetectAndMount(URI Get) +bool CDROMMethod::AutoDetectAndMount(URI Get, string NewID) { vector<struct CdromDevice> v = UdevCdroms.Scan(); @@ -103,7 +103,7 @@ bool CDROMMethod::AutoDetectAndMount(URI Get) { if (Debug) clog << "Checking mounted cdrom device " << v[i].DeviceName << endl; - if (IsCorrectCD(Get, v[i].MountPath)) + if (IsCorrectCD(Get, v[i].MountPath, NewID)) { CDROM = v[i].MountPath; return true; @@ -126,7 +126,7 @@ bool CDROMMethod::AutoDetectAndMount(URI Get) { if(MountCdrom("/media/apt", v[i].DeviceName)) { - if (IsCorrectCD(Get, "/media/apt")) + if (IsCorrectCD(Get, "/media/apt", NewID)) { MountedByApt = true; CDROM = "/media/apt"; @@ -144,10 +144,8 @@ bool CDROMMethod::AutoDetectAndMount(URI Get) // CDROMMethod::IsCorrectCD /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CDROMMethod::IsCorrectCD(URI want, string MountPath) +bool CDROMMethod::IsCorrectCD(URI want, string MountPath, string& NewID) { - string NewID; - for (unsigned int Version = 2; Version != 0; Version--) { if (IdentCdrom(MountPath,NewID,Version) == false) @@ -226,17 +224,17 @@ bool CDROMMethod::Fetch(FetchItem *Itm) if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; - string NewID; + string NewID; while (CurrentID.empty() == true) { if (CDROM == "apt-udev-auto/") - AutoDetectAndMount(Get); + AutoDetectAndMount(Get, NewID); if(!IsMounted(CDROM)) MountedByApt = MountCdrom(CDROM); - if (IsCorrectCD(Get, CDROM)) + if (IsCorrectCD(Get, CDROM, NewID)) break; // I suppose this should prompt somehow? -- cgit v1.2.3-70-g09d2 From ff1e4b0626d8ce567492ccadbd30dfc32d4c15f1 Mon Sep 17 00:00:00 2001 From: Michael Vogt <michael.vogt@ubuntu.com> Date: Tue, 26 Jan 2010 11:27:58 +0100 Subject: add new "Acquire::cdrom::AutoDetect" variable that enables/disables the dlopen of libudev for automatic cdrom detection --- debian/changelog | 2 ++ doc/examples/configure-index | 4 ++++ methods/cdrom.cc | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b499d7298..7e38cda99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ apt (0.7.25.1) UNRELEASED; urgency=low the umount again * methods/cdrom.cc: - fixes in multi cdrom setup code + - add new "Acquire::cdrom::AutoDetect" variable that enables/disables + the dlopen of libudev for automatic cdrom detection -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 18 Dec 2009 16:54:18 +0100 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 1e9946e1b..317acddf6 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -250,6 +250,10 @@ Acquire cdrom { + // do auto detection of the cdrom mountpoint + AutoDetect "true"; + + // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used) mount "/cdrom"; // You need the trailing slash! diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 763547013..87794b052 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -218,6 +218,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) return true; } + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); if (Debug) clog << "Looking for CDROM at " << CDROM << endl; @@ -228,7 +229,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) string NewID; while (CurrentID.empty() == true) { - if (CDROM == "apt-udev-auto/") + if (AutoDetect) AutoDetectAndMount(Get, NewID); if(!IsMounted(CDROM)) -- cgit v1.2.3-70-g09d2