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 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 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 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 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 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 a6418a4b93376e0e4acf36e88eb1d0ec41e024df Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Jul 2009 18:01:43 +0200 Subject: * methods/cdrom.cc: - add Acquire::Cdrom::mount "apt-udev-auto" magic to allow dynamically finding the cdrom device * apt-pkg/contrib/cdromutl.{h,cc}: - support additional (optional) DeviceName parameter for MountCdrom() --- apt-pkg/contrib/cdromutl.cc | 13 +++++-- apt-pkg/contrib/cdromutl.h | 3 +- debian/changelog | 7 ++++ methods/cdrom.cc | 82 +++++++++++++++++++++++++++++++++++---------- 4 files changed, 84 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc index b6524a178..0cf9697ac 100644 --- a/apt-pkg/contrib/cdromutl.cc +++ b/apt-pkg/contrib/cdromutl.cc @@ -98,7 +98,7 @@ bool UnmountCdrom(string Path) // MountCdrom - Mount a cdrom /*{{{*/ // --------------------------------------------------------------------- /* We fork mount and drop all messages */ -bool MountCdrom(string Path) +bool MountCdrom(string Path, string DeviceName) { if (IsMounted(Path) == true) return true; @@ -122,8 +122,15 @@ bool MountCdrom(string Path) { const char *Args[10]; Args[0] = "mount"; - Args[1] = Path.c_str(); - Args[2] = 0; + if (DeviceName == "") + { + Args[1] = Path.c_str(); + Args[2] = 0; + } else { + Args[1] = DeviceName.c_str(); + Args[2] = Path.c_str(); + Args[3] = 0; + } execvp(Args[0],(char **)Args); _exit(100); } diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h index f24bb8c70..9d14249c5 100644 --- a/apt-pkg/contrib/cdromutl.h +++ b/apt-pkg/contrib/cdromutl.h @@ -14,7 +14,8 @@ using std::string; -bool MountCdrom(string Path); +// mount cdrom, DeviceName (e.g. /dev/sr0) is optional +bool MountCdrom(string Path, string DeviceName=""); bool UnmountCdrom(string Path); bool IdentCdrom(string CD,string &Res,unsigned int Version = 2); bool IsMounted(string &Path); diff --git a/debian/changelog b/debian/changelog index 65fd9e590..cce7fc0f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.22) unstable; urgency=low + + * add Acquire::Cdrom::mount "apt-udev-auto" magic to allow + dynamically finding the cdrom device + + -- Michael Vogt Wed, 22 Jul 2009 18:00:53 +0200 + apt (0.7.21) UNRELEASED; urgency=low [ Osamu Aoki ] diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 7a20ae514..cd0d4e512 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -9,6 +9,7 @@ /*}}}*/ // Include Files /*{{{*/ #include +#include #include #include #include @@ -33,6 +34,7 @@ class CDROMMethod : public pkgAcqMethod string CDROM; bool MountedByApt; + bool IsCorrectCD(URI want, string MountPath); virtual bool Fetch(FetchItem *Itm); string GetID(string Name); virtual void Exit(); @@ -84,6 +86,31 @@ string CDROMMethod::GetID(string Name) return string(); } /*}}}*/ + +// CDROMMethod::IsCorrectCD /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CDROMMethod::IsCorrectCD(URI want, string MountPath) +{ + bool Debug = _config->FindB("Debug::Acquire::cdrom",false); + string NewID; + + for (unsigned int Version = 2; Version != 0; Version--) + { + if (IdentCdrom(MountPath,NewID,Version) == false) + return false; + + if (Debug == true) + clog << "ID " << Version << " " << NewID << endl; + + // A hit + if (Database.Find("CD::" + NewID) == want.Host) + return true; + } + + return false; +} + /*}}}*/ // CDROMMethod::Fetch - Fetch a file /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -134,8 +161,44 @@ bool CDROMMethod::Fetch(FetchItem *Itm) Fail(_("Wrong CD-ROM"),true); return true; } - + CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); + + // auto-detect mode + if (CDROM == "apt-udev-auto/") + { + pkgUdevCdromDevices udev; + if(udev.Dlopen()) + { + vector v = udev.Scan(); + for (unsigned int i=0; i < v.size(); i++) + { + if (!v[i].Mounted) + { + if (!FileExists("/media/apt")) + mkdir("/media/apt", 0755); + if(MountCdrom("/media/apt", v[i].DeviceName)) + { + if (IsCorrectCD(Get, "/media/apt")) + { + MountedByApt = true; + CDROM = "/media/apt"; + break; + } else { + UnmountCdrom("/media/apt"); + } + } + } else { + if (IsCorrectCD(Get, v[i].MountPath)) + { + CDROM = v[i].MountPath; + break; + } + } + } + } + } + if (CDROM[0] == '.') CDROM= SafeGetCWD() + '/' + CDROM; string NewID; @@ -144,23 +207,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm) bool Hit = false; if(!IsMounted(CDROM)) MountedByApt = MountCdrom(CDROM); - for (unsigned int Version = 2; Version != 0; Version--) - { - if (IdentCdrom(CDROM,NewID,Version) == false) - return false; - - if (Debug == true) - clog << "ID " << Version << " " << NewID << endl; - // A hit - if (Database.Find("CD::" + NewID) == Get.Host) - { - Hit = true; - break; - } - } - - if (Hit == true) + if (IsCorrectCD(Get, CDROM)) break; // I suppose this should prompt somehow? -- 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